Skip to content

Commit 6903d6b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17781 from hakman/release-1.35.0-alpha.1
Release 1.35.0-alpha.1
2 parents 5bb5ec5 + d52a008 commit 6903d6b

File tree

185 files changed

+550
-550
lines changed

Some content is hidden

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

185 files changed

+550
-550
lines changed

‎kops-version.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func KopsVersionImageTag() string {
3030

3131
// These constants are parsed by build tooling - be careful about changing the formats
3232
const (
33-
KOPS_RELEASE_VERSION = "1.34.0-beta.1"
34-
KOPS_CI_VERSION = "1.34.0-beta.2"
33+
KOPS_RELEASE_VERSION = "1.35.0-alpha.1"
34+
KOPS_CI_VERSION = "1.35.0-alpha.2"
3535
)
3636

3737
// GitVersion should be replaced by the makefile

‎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-beta.1
115+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.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-beta.1
164+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
165165
name: init-etcd-symlinks-3-4-13
166166
resources: {}
167167
volumeMounts:
@@ -183,7 +183,7 @@ Contents: |
183183
- --src=/opt/etcd-v3.5.24/etcdctl
184184
command:
185185
- /opt/kops-utils/kops-utils-cp
186-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
186+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
187187
name: init-etcd-symlinks-3-5-24
188188
resources: {}
189189
volumeMounts:
@@ -267,7 +267,7 @@ Contents: |
267267
- --src=/ko-app/kops-utils-cp
268268
command:
269269
- /ko-app/kops-utils-cp
270-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
270+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
271271
name: kops-utils-cp
272272
resources: {}
273273
volumeMounts:
@@ -316,7 +316,7 @@ Contents: |
316316
- --src=/opt/etcd-v3.4.13/etcdctl
317317
command:
318318
- /opt/kops-utils/kops-utils-cp
319-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
319+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
320320
name: init-etcd-symlinks-3-4-13
321321
resources: {}
322322
volumeMounts:
@@ -338,7 +338,7 @@ Contents: |
338338
- --src=/opt/etcd-v3.5.24/etcdctl
339339
command:
340340
- /opt/kops-utils/kops-utils-cp
341-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
341+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
342342
name: init-etcd-symlinks-3-5-24
343343
resources: {}
344344
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-beta.1
117+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.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-beta.1
166+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
167167
name: init-etcd-symlinks-3-4-13
168168
resources: {}
169169
volumeMounts:
@@ -185,7 +185,7 @@ Contents: |
185185
- --src=/opt/etcd-v3.5.24/etcdctl
186186
command:
187187
- /opt/kops-utils/kops-utils-cp
188-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
188+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
189189
name: init-etcd-symlinks-3-5-24
190190
resources: {}
191191
volumeMounts:
@@ -271,7 +271,7 @@ Contents: |
271271
- --src=/ko-app/kops-utils-cp
272272
command:
273273
- /ko-app/kops-utils-cp
274-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
274+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
275275
name: kops-utils-cp
276276
resources: {}
277277
volumeMounts:
@@ -320,7 +320,7 @@ Contents: |
320320
- --src=/opt/etcd-v3.4.13/etcdctl
321321
command:
322322
- /opt/kops-utils/kops-utils-cp
323-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
323+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
324324
name: init-etcd-symlinks-3-4-13
325325
resources: {}
326326
volumeMounts:
@@ -342,7 +342,7 @@ Contents: |
342342
- --src=/opt/etcd-v3.5.24/etcdctl
343343
command:
344344
- /opt/kops-utils/kops-utils-cp
345-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
345+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
346346
name: init-etcd-symlinks-3-5-24
347347
resources: {}
348348
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-beta.1
123+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.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-beta.1
172+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
173173
name: init-etcd-symlinks-3-4-13
174174
resources: {}
175175
volumeMounts:
@@ -191,7 +191,7 @@ Contents: |
191191
- --src=/opt/etcd-v3.5.24/etcdctl
192192
command:
193193
- /opt/kops-utils/kops-utils-cp
194-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
194+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
195195
name: init-etcd-symlinks-3-5-24
196196
resources: {}
197197
volumeMounts:
@@ -283,7 +283,7 @@ Contents: |
283283
- --src=/ko-app/kops-utils-cp
284284
command:
285285
- /ko-app/kops-utils-cp
286-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
286+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
287287
name: kops-utils-cp
288288
resources: {}
289289
volumeMounts:
@@ -332,7 +332,7 @@ Contents: |
332332
- --src=/opt/etcd-v3.4.13/etcdctl
333333
command:
334334
- /opt/kops-utils/kops-utils-cp
335-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
335+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
336336
name: init-etcd-symlinks-3-4-13
337337
resources: {}
338338
volumeMounts:
@@ -354,7 +354,7 @@ Contents: |
354354
- --src=/opt/etcd-v3.5.24/etcdctl
355355
command:
356356
- /opt/kops-utils/kops-utils-cp
357-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
357+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
358358
name: init-etcd-symlinks-3-5-24
359359
resources: {}
360360
volumeMounts:

‎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-beta.1
12+
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.35.0-alpha.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-beta.1/linux/amd64/nodeup",
40-
"https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/nodeup-linux-amd64",
39+
"https://artifacts.k8s.io/binaries/kops/" + kops.Version + "/linux/amd64/nodeup",
40+
"https://github.com/kubernetes/kops/releases/download/v" + kops.Version + "/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-beta.1/linux/arm64/nodeup",
47-
"https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/nodeup-linux-arm64",
46+
"https://artifacts.k8s.io/binaries/kops/" + kops.Version + "/linux/arm64/nodeup",
47+
"https://github.com/kubernetes/kops/releases/download/v" + kops.Version + "/nodeup-linux-arm64",
4848
},
4949
},
5050
}

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- --src=/ko-app/kops-utils-cp
4848
command:
4949
- /ko-app/kops-utils-cp
50-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
50+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
5151
name: kops-utils-cp
5252
resources: {}
5353
volumeMounts:
@@ -96,7 +96,7 @@ spec:
9696
- --src=/opt/etcd-v3.4.13/etcdctl
9797
command:
9898
- /opt/kops-utils/kops-utils-cp
99-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
99+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
100100
name: init-etcd-symlinks-3-4-13
101101
resources: {}
102102
volumeMounts:
@@ -118,7 +118,7 @@ spec:
118118
- --src=/opt/etcd-v3.5.24/etcdctl
119119
command:
120120
- /opt/kops-utils/kops-utils-cp
121-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
121+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
122122
name: init-etcd-symlinks-3-5-24
123123
resources: {}
124124
volumeMounts:

‎tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- --src=/ko-app/kops-utils-cp
4848
command:
4949
- /ko-app/kops-utils-cp
50-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
50+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
5151
name: kops-utils-cp
5252
resources: {}
5353
volumeMounts:
@@ -96,7 +96,7 @@ spec:
9696
- --src=/opt/etcd-v3.4.13/etcdctl
9797
command:
9898
- /opt/kops-utils/kops-utils-cp
99-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
99+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
100100
name: init-etcd-symlinks-3-4-13
101101
resources: {}
102102
volumeMounts:
@@ -118,7 +118,7 @@ spec:
118118
- --src=/opt/etcd-v3.5.24/etcdctl
119119
command:
120120
- /opt/kops-utils/kops-utils-cp
121-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
121+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
122122
name: init-etcd-symlinks-3-5-24
123123
resources: {}
124124
volumeMounts:

‎tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-events-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
- --src=/ko-app/kops-utils-cp
4949
command:
5050
- /ko-app/kops-utils-cp
51-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
51+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
5252
name: kops-utils-cp
5353
resources: {}
5454
volumeMounts:
@@ -97,7 +97,7 @@ spec:
9797
- --src=/opt/etcd-v3.4.13/etcdctl
9898
command:
9999
- /opt/kops-utils/kops-utils-cp
100-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
100+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
101101
name: init-etcd-symlinks-3-4-13
102102
resources: {}
103103
volumeMounts:
@@ -119,7 +119,7 @@ spec:
119119
- --src=/opt/etcd-v3.5.24/etcdctl
120120
command:
121121
- /opt/kops-utils/kops-utils-cp
122-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
122+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
123123
name: init-etcd-symlinks-3-5-24
124124
resources: {}
125125
volumeMounts:

‎tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_manifests-etcdmanager-main-master-us-test-1a_content‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ spec:
4848
- --src=/ko-app/kops-utils-cp
4949
command:
5050
- /ko-app/kops-utils-cp
51-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
51+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
5252
name: kops-utils-cp
5353
resources: {}
5454
volumeMounts:
@@ -97,7 +97,7 @@ spec:
9797
- --src=/opt/etcd-v3.4.13/etcdctl
9898
command:
9999
- /opt/kops-utils/kops-utils-cp
100-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
100+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
101101
name: init-etcd-symlinks-3-4-13
102102
resources: {}
103103
volumeMounts:
@@ -119,7 +119,7 @@ spec:
119119
- --src=/opt/etcd-v3.5.24/etcdctl
120120
command:
121121
- /opt/kops-utils/kops-utils-cp
122-
image: registry.k8s.io/kops/kops-utils-cp:1.34.0-beta.1
122+
image: registry.k8s.io/kops/kops-utils-cp:1.35.0-alpha.1
123123
name: init-etcd-symlinks-3-5-24
124124
resources: {}
125125
volumeMounts:

0 commit comments

Comments
 (0)