Skip to content

Commit 6e60f0d

Browse files
hakmanhakman
authored
Release 1.34.0-beta.1 (#17646)
1 parent 5a50501 commit 6e60f0d

File tree

487 files changed

+1226
-1226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

487 files changed

+1226
-1226
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
6666
# We lock the versions of our controllers also
6767
# We need to keep in sync with:
6868
# pkg/model/components/etcdmanager/model.go
69-
KOPS_UTILS_CP_TAG=1.34.0-alpha.1
69+
KOPS_UTILS_CP_TAG=1.34.0-beta.1
7070
KOPS_UTILS_CP_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_UTILS_CP_TAG | awk '{print $$2}')
7171
# upup/models/cloudup/resources/addons/dns-controller/
72-
DNS_CONTROLLER_TAG=1.34.0-alpha.1
72+
DNS_CONTROLLER_TAG=1.34.0-beta.1
7373
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
7474
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
75-
KOPS_CONTROLLER_TAG=1.34.0-alpha.1
75+
KOPS_CONTROLLER_TAG=1.34.0-beta.1
7676
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
7777
# pkg/model/components/kubeapiserver/model.go
78-
KUBE_APISERVER_HEALTHCHECK_TAG=1.34.0-alpha.1
78+
KUBE_APISERVER_HEALTHCHECK_TAG=1.34.0-beta.1
7979
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
8080

8181
CGO_ENABLED=0

‎kops-version.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
2121

2222
// These constants are parsed by build tooling - be careful about changing the formats
2323
const (
24-
KOPS_RELEASE_VERSION = "1.34.0-alpha.1"
25-
KOPS_CI_VERSION = "1.34.0-alpha.2"
24+
KOPS_RELEASE_VERSION = "1.34.0-beta.1"
25+
KOPS_CI_VERSION = "1.34.0-beta.2"
2626
)
2727

2828
// GitVersion should be replaced by the makefile

‎pkg/model/components/etcdmanager/model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ spec:
208208
emptyDir: {}
209209
`
210210

211-
const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1"
211+
const kopsUtilsImage = "registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1"
212212

213213
// buildPod creates the pod spec, based on the EtcdClusterSpec
214214
func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instanceGroupName string) (*v1.Pod, error) {

‎pkg/model/components/etcdmanager/tests/interval/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Contents: |
112112
- --src=/ko-app/kops-utils-cp
113113
command:
114114
- /ko-app/kops-utils-cp
115-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
115+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
116116
name: kops-utils-cp
117117
resources: {}
118118
volumeMounts:
@@ -161,7 +161,7 @@ Contents: |
161161
- --src=/opt/etcd-v3.4.13/etcdctl
162162
command:
163163
- /opt/kops-utils/kops-utils-cp
164-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
164+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
165165
name: init-etcd-symlinks-3-4-13
166166
resources: {}
167167
volumeMounts:
@@ -182,7 +182,7 @@ Contents: |
182182
- --src=/opt/etcd-v3.5.21/etcdctl
183183
command:
184184
- /opt/kops-utils/kops-utils-cp
185-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
185+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
186186
name: init-etcd-symlinks-3-5-21
187187
resources: {}
188188
volumeMounts:
@@ -266,7 +266,7 @@ Contents: |
266266
- --src=/ko-app/kops-utils-cp
267267
command:
268268
- /ko-app/kops-utils-cp
269-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
269+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
270270
name: kops-utils-cp
271271
resources: {}
272272
volumeMounts:
@@ -315,7 +315,7 @@ Contents: |
315315
- --src=/opt/etcd-v3.4.13/etcdctl
316316
command:
317317
- /opt/kops-utils/kops-utils-cp
318-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
318+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
319319
name: init-etcd-symlinks-3-4-13
320320
resources: {}
321321
volumeMounts:
@@ -336,7 +336,7 @@ Contents: |
336336
- --src=/opt/etcd-v3.5.21/etcdctl
337337
command:
338338
- /opt/kops-utils/kops-utils-cp
339-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
339+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
340340
name: init-etcd-symlinks-3-5-21
341341
resources: {}
342342
volumeMounts:

‎pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Contents: |
114114
- --src=/ko-app/kops-utils-cp
115115
command:
116116
- /ko-app/kops-utils-cp
117-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
117+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
118118
name: kops-utils-cp
119119
resources: {}
120120
volumeMounts:
@@ -163,7 +163,7 @@ Contents: |
163163
- --src=/opt/etcd-v3.4.13/etcdctl
164164
command:
165165
- /opt/kops-utils/kops-utils-cp
166-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
166+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
167167
name: init-etcd-symlinks-3-4-13
168168
resources: {}
169169
volumeMounts:
@@ -184,7 +184,7 @@ Contents: |
184184
- --src=/opt/etcd-v3.5.21/etcdctl
185185
command:
186186
- /opt/kops-utils/kops-utils-cp
187-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
187+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
188188
name: init-etcd-symlinks-3-5-21
189189
resources: {}
190190
volumeMounts:
@@ -270,7 +270,7 @@ Contents: |
270270
- --src=/ko-app/kops-utils-cp
271271
command:
272272
- /ko-app/kops-utils-cp
273-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
273+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
274274
name: kops-utils-cp
275275
resources: {}
276276
volumeMounts:
@@ -319,7 +319,7 @@ Contents: |
319319
- --src=/opt/etcd-v3.4.13/etcdctl
320320
command:
321321
- /opt/kops-utils/kops-utils-cp
322-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
322+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
323323
name: init-etcd-symlinks-3-4-13
324324
resources: {}
325325
volumeMounts:
@@ -340,7 +340,7 @@ Contents: |
340340
- --src=/opt/etcd-v3.5.21/etcdctl
341341
command:
342342
- /opt/kops-utils/kops-utils-cp
343-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
343+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
344344
name: init-etcd-symlinks-3-5-21
345345
resources: {}
346346
volumeMounts:

‎pkg/model/components/etcdmanager/tests/proxy/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Contents: |
120120
- --src=/ko-app/kops-utils-cp
121121
command:
122122
- /ko-app/kops-utils-cp
123-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
123+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
124124
name: kops-utils-cp
125125
resources: {}
126126
volumeMounts:
@@ -169,7 +169,7 @@ Contents: |
169169
- --src=/opt/etcd-v3.4.13/etcdctl
170170
command:
171171
- /opt/kops-utils/kops-utils-cp
172-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
172+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
173173
name: init-etcd-symlinks-3-4-13
174174
resources: {}
175175
volumeMounts:
@@ -190,7 +190,7 @@ Contents: |
190190
- --src=/opt/etcd-v3.5.21/etcdctl
191191
command:
192192
- /opt/kops-utils/kops-utils-cp
193-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
193+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
194194
name: init-etcd-symlinks-3-5-21
195195
resources: {}
196196
volumeMounts:
@@ -282,7 +282,7 @@ Contents: |
282282
- --src=/ko-app/kops-utils-cp
283283
command:
284284
- /ko-app/kops-utils-cp
285-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
285+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
286286
name: kops-utils-cp
287287
resources: {}
288288
volumeMounts:
@@ -331,7 +331,7 @@ Contents: |
331331
- --src=/opt/etcd-v3.4.13/etcdctl
332332
command:
333333
- /opt/kops-utils/kops-utils-cp
334-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
334+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
335335
name: init-etcd-symlinks-3-4-13
336336
resources: {}
337337
volumeMounts:
@@ -352,7 +352,7 @@ Contents: |
352352
- --src=/opt/etcd-v3.5.21/etcdctl
353353
command:
354354
- /opt/kops-utils/kops-utils-cp
355-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-alpha.1
355+
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
356356
name: init-etcd-symlinks-3-5-21
357357
resources: {}
358358
volumeMounts:

‎pkg/model/components/kubeapiserver/model.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ kind: Pod
8080
spec:
8181
containers:
8282
- name: healthcheck
83-
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.0-alpha.1
83+
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.0-beta.1
8484
livenessProbe:
8585
httpGet:
8686
# The sidecar serves a healthcheck on the same port,

‎pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Contents: |
99
- --ca-cert=/secrets/ca.crt
1010
- --client-cert=/secrets/client.crt
1111
- --client-key=/secrets/client.key
12-
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.0-alpha.1
12+
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.0-beta.1
1313
livenessProbe:
1414
httpGet:
1515
host: 127.0.0.1

‎pkg/nodemodel/wellknownassets/kopsassets_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ func Test_BuildMirroredAsset(t *testing.T) {
3636
{
3737
url: "https://artifacts.k8s.io/binaries/kops/%s/linux/amd64/nodeup",
3838
expected: []string{
39-
"https://artifacts.k8s.io/binaries/kops/1.34.0-alpha.1/linux/amd64/nodeup",
40-
"https://github.com/kubernetes/kops/releases/download/v1.34.0-alpha.1/nodeup-linux-amd64",
39+
"https://artifacts.k8s.io/binaries/kops/1.34.0-beta.1/linux/amd64/nodeup",
40+
"https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/nodeup-linux-amd64",
4141
},
4242
},
4343
{
4444
url: "https://artifacts.k8s.io/binaries/kops/%s/linux/arm64/nodeup",
4545
expected: []string{
46-
"https://artifacts.k8s.io/binaries/kops/1.34.0-alpha.1/linux/arm64/nodeup",
47-
"https://github.com/kubernetes/kops/releases/download/v1.34.0-alpha.1/nodeup-linux-arm64",
46+
"https://artifacts.k8s.io/binaries/kops/1.34.0-beta.1/linux/arm64/nodeup",
47+
"https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/nodeup-linux-arm64",
4848
},
4949
},
5050
}

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ spec:
55
addons:
66
- id: k8s-1.16
77
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
8-
manifestHash: c5482e96a1906be366351f7a4273e9b1132a9212cad57351e69fa680628f55a8
8+
manifestHash: 21c4c6429b8492f0499a751b7c319b5e9e702679df53bdf3fa285e19da46d89a
99
name: kops-controller.addons.k8s.io
1010
needsRollingUpdate: control-plane
1111
selector:
@@ -33,7 +33,7 @@ spec:
3333
version: 9.99.0
3434
- id: k8s-1.12
3535
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
36-
manifestHash: 9c57a5e2c600d731c0eca6f82fbd981fe0ecd0e45f474a84219f9c764b95db67
36+
manifestHash: ac39ba3681a868018a591156cbd7d9887f02a69fc08ad56042533b0009a7af4e
3737
name: dns-controller.addons.k8s.io
3838
selector:
3939
k8s-addon: dns-controller.addons.k8s.io

0 commit comments

Comments
 (0)