Skip to content

Commit b5bc1a6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #35403 from sbueringer/pr-bump-capi-v1.34
Bump Cluster API jobs for Kubernetes v1.34/v1.35
2 parents 6c7c360 + 65a15e7 commit b5bc1a6

6 files changed

+65
-61
lines changed

‎config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics-upgrades.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
22
periodics:
3-
- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-main
3+
- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-main
44
cluster: eks-prow-build-cluster
55
interval: 24h
66
decorate: true
@@ -32,13 +32,13 @@ periodics:
3232
- name: ALWAYS_BUILD_KIND_IMAGES
3333
value: "true"
3434
- name: KUBERNETES_VERSION_UPGRADE_FROM
35-
value: "stable-1.28"
36-
- name: KUBERNETES_VERSION_UPGRADE_TO
3735
value: "stable-1.29"
36+
- name: KUBERNETES_VERSION_UPGRADE_TO
37+
value: "stable-1.30"
3838
- name: ETCD_VERSION_UPGRADE_TO
39-
value: "3.5.16-0"
39+
value: "3.5.15-0"
4040
- name: COREDNS_VERSION_UPGRADE_TO
41-
value: "v1.11.1"
41+
value: "v1.11.3"
4242
- name: GINKGO_LABEL_FILTER
4343
value: "(Conformance && K8s-Upgrade)"
4444
# we need privileged mode in order to do docker in docker
@@ -53,11 +53,11 @@ periodics:
5353
memory: 6Gi
5454
annotations:
5555
testgrid-dashboards: cluster-api-core-main
56-
testgrid-tab-name: capi-e2e-main-1-28-1-29
56+
testgrid-tab-name: capi-e2e-main-1-29-1-30
5757
testgrid-alert-email: [email protected]
5858
testgrid-num-failures-to-alert: "4"
5959

60-
- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-main
60+
- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-main
6161
cluster: eks-prow-build-cluster
6262
interval: 24h
6363
decorate: true
@@ -89,9 +89,9 @@ periodics:
8989
- name: ALWAYS_BUILD_KIND_IMAGES
9090
value: "true"
9191
- name: KUBERNETES_VERSION_UPGRADE_FROM
92-
value: "stable-1.29"
93-
- name: KUBERNETES_VERSION_UPGRADE_TO
9492
value: "stable-1.30"
93+
- name: KUBERNETES_VERSION_UPGRADE_TO
94+
value: "stable-1.31"
9595
- name: ETCD_VERSION_UPGRADE_TO
9696
value: "3.5.15-0"
9797
- name: COREDNS_VERSION_UPGRADE_TO
@@ -110,11 +110,11 @@ periodics:
110110
memory: 6Gi
111111
annotations:
112112
testgrid-dashboards: cluster-api-core-main
113-
testgrid-tab-name: capi-e2e-main-1-29-1-30
113+
testgrid-tab-name: capi-e2e-main-1-30-1-31
114114
testgrid-alert-email: [email protected]
115115
testgrid-num-failures-to-alert: "4"
116116

117-
- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-main
117+
- name: periodic-cluster-api-e2e-upgrade-1-31-1-32-main
118118
cluster: eks-prow-build-cluster
119119
interval: 24h
120120
decorate: true
@@ -146,11 +146,11 @@ periodics:
146146
- name: ALWAYS_BUILD_KIND_IMAGES
147147
value: "true"
148148
- name: KUBERNETES_VERSION_UPGRADE_FROM
149-
value: "stable-1.30"
150-
- name: KUBERNETES_VERSION_UPGRADE_TO
151149
value: "stable-1.31"
150+
- name: KUBERNETES_VERSION_UPGRADE_TO
151+
value: "stable-1.32"
152152
- name: ETCD_VERSION_UPGRADE_TO
153-
value: "3.5.15-0"
153+
value: "3.5.16-0"
154154
- name: COREDNS_VERSION_UPGRADE_TO
155155
value: "v1.11.3"
156156
- name: GINKGO_LABEL_FILTER
@@ -167,11 +167,11 @@ periodics:
167167
memory: 6Gi
168168
annotations:
169169
testgrid-dashboards: cluster-api-core-main
170-
testgrid-tab-name: capi-e2e-main-1-30-1-31
170+
testgrid-tab-name: capi-e2e-main-1-31-1-32
171171
testgrid-alert-email: [email protected]
172172
testgrid-num-failures-to-alert: "4"
173173

174-
- name: periodic-cluster-api-e2e-upgrade-1-31-1-32-main
174+
- name: periodic-cluster-api-e2e-upgrade-1-32-1-33-main
175175
cluster: eks-prow-build-cluster
176176
interval: 24h
177177
decorate: true
@@ -203,13 +203,13 @@ periodics:
203203
- name: ALWAYS_BUILD_KIND_IMAGES
204204
value: "true"
205205
- name: KUBERNETES_VERSION_UPGRADE_FROM
206-
value: "stable-1.31"
207-
- name: KUBERNETES_VERSION_UPGRADE_TO
208206
value: "stable-1.32"
207+
- name: KUBERNETES_VERSION_UPGRADE_TO
208+
value: "stable-1.33"
209209
- name: ETCD_VERSION_UPGRADE_TO
210-
value: "3.5.16-0"
210+
value: "3.5.21-0"
211211
- name: COREDNS_VERSION_UPGRADE_TO
212-
value: "v1.11.3"
212+
value: "v1.12.0"
213213
- name: GINKGO_LABEL_FILTER
214214
value: "(Conformance && K8s-Upgrade)"
215215
# we need privileged mode in order to do docker in docker
@@ -224,11 +224,11 @@ periodics:
224224
memory: 6Gi
225225
annotations:
226226
testgrid-dashboards: cluster-api-core-main
227-
testgrid-tab-name: capi-e2e-main-1-31-1-32
227+
testgrid-tab-name: capi-e2e-main-1-32-1-33
228228
testgrid-alert-email: [email protected]
229229
testgrid-num-failures-to-alert: "4"
230230

231-
- name: periodic-cluster-api-e2e-upgrade-1-32-1-33-main
231+
- name: periodic-cluster-api-e2e-upgrade-1-33-1-34-main
232232
cluster: eks-prow-build-cluster
233233
interval: 24h
234234
decorate: true
@@ -260,13 +260,13 @@ periodics:
260260
- name: ALWAYS_BUILD_KIND_IMAGES
261261
value: "true"
262262
- name: KUBERNETES_VERSION_UPGRADE_FROM
263-
value: "stable-1.32"
264-
- name: KUBERNETES_VERSION_UPGRADE_TO
265263
value: "stable-1.33"
264+
- name: KUBERNETES_VERSION_UPGRADE_TO
265+
value: "stable-1.34"
266266
- name: ETCD_VERSION_UPGRADE_TO
267-
value: "3.5.21-0"
267+
value: "3.6.4-0"
268268
- name: COREDNS_VERSION_UPGRADE_TO
269-
value: "v1.12.0"
269+
value: "v1.12.1"
270270
- name: GINKGO_LABEL_FILTER
271271
value: "(Conformance && K8s-Upgrade)"
272272
# we need privileged mode in order to do docker in docker
@@ -281,11 +281,11 @@ periodics:
281281
memory: 6Gi
282282
annotations:
283283
testgrid-dashboards: cluster-api-core-main
284-
testgrid-tab-name: capi-e2e-main-1-32-1-33
284+
testgrid-tab-name: capi-e2e-main-1-33-1-34
285285
testgrid-alert-email: [email protected]
286286
testgrid-num-failures-to-alert: "4"
287287

288-
- name: periodic-cluster-api-e2e-upgrade-1-33-1-34-main
288+
- name: periodic-cluster-api-e2e-upgrade-1-34-1-35-main
289289
cluster: eks-prow-build-cluster
290290
interval: 24h
291291
decorate: true
@@ -317,11 +317,11 @@ periodics:
317317
- name: ALWAYS_BUILD_KIND_IMAGES
318318
value: "true"
319319
- name: KUBERNETES_VERSION_UPGRADE_FROM
320-
value: "stable-1.33"
320+
value: "stable-1.34"
321321
- name: KUBERNETES_VERSION_UPGRADE_TO
322-
value: "ci/latest-1.34"
322+
value: "ci/latest-1.35"
323323
- name: ETCD_VERSION_UPGRADE_TO
324-
value: "3.6.1-1"
324+
value: "3.6.4-0"
325325
- name: COREDNS_VERSION_UPGRADE_TO
326326
value: "v1.12.1"
327327
- name: GINKGO_LABEL_FILTER
@@ -338,6 +338,6 @@ periodics:
338338
memory: 6Gi
339339
annotations:
340340
testgrid-dashboards: cluster-api-core-main
341-
testgrid-tab-name: capi-e2e-main-1-33-1-34
341+
testgrid-tab-name: capi-e2e-main-1-34-1-35
342342
testgrid-alert-email: [email protected]
343343
testgrid-num-failures-to-alert: "4"

‎config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ periodics:
6363
# To check the latest available envtest in Kubebuilder for the minor version we determined above, please
6464
# refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
6565
- name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
66-
value: "1.30.3"
66+
value: "1.31.0"
6767
resources:
6868
requests:
6969
cpu: 7300m
@@ -172,7 +172,7 @@ periodics:
172172
# Please also make sure to refer a version where a kindest/node image exists
173173
# for (see https://github.com/kubernetes-sigs/kind/releases/)
174174
- name: KUBERNETES_VERSION_MANAGEMENT
175-
value: "v1.30.10"
175+
value: "v1.31.12"
176176
# we need privileged mode in order to do docker in docker
177177
securityContext:
178178
privileged: true
@@ -325,15 +325,15 @@ periodics:
325325
- name: KIND_BUILD_IMAGES
326326
value: "KUBERNETES_VERSION_LATEST_CI"
327327
- name: KUBERNETES_VERSION_MANAGEMENT
328-
value: ci/latest-1.34
328+
value: ci/latest-1.35
329329
- name: KUBERNETES_VERSION
330-
value: ci/latest-1.34
330+
value: ci/latest-1.35
331331
- name: KUBERNETES_VERSION_UPGRADE_FROM
332-
value: stable-1.33
332+
value: stable-1.34
333333
- name: KUBERNETES_VERSION_UPGRADE_TO
334-
value: ci/latest-1.34
334+
value: ci/latest-1.35
335335
- name: ETCD_VERSION_UPGRADE_TO
336-
value: 3.6.1-1
336+
value: 3.6.4-0
337337
- name: COREDNS_VERSION_UPGRADE_TO
338338
value: v1.12.1
339339
# we need privileged mode in order to do docker in docker

‎config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ presubmits:
135135
# To check the latest available envtest in Kubebuilder for the minor version we determined above, please
136136
# refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
137137
- name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
138-
value: "1.30.3"
138+
value: "1.31.0"
139139
resources:
140140
requests:
141141
cpu: 7300m
@@ -186,7 +186,7 @@ presubmits:
186186
# Please also make sure to refer a version where a kindest/node image exists
187187
# for (see https://github.com/kubernetes-sigs/kind/releases/)
188188
- name: KUBERNETES_VERSION_MANAGEMENT
189-
value: "v1.30.10"
189+
value: "v1.31.12"
190190
# we need privileged mode in order to do docker in docker
191191
securityContext:
192192
privileged: true
@@ -289,7 +289,7 @@ presubmits:
289289
annotations:
290290
testgrid-dashboards: cluster-api-core-main
291291
testgrid-tab-name: capi-pr-e2e-main
292-
- name: pull-cluster-api-e2e-upgrade-1-33-1-34-main
292+
- name: pull-cluster-api-e2e-upgrade-1-34-1-35-main
293293
cluster: eks-prow-build-cluster
294294
labels:
295295
preset-dind-enabled: "true"
@@ -317,11 +317,11 @@ presubmits:
317317
- name: ALWAYS_BUILD_KIND_IMAGES
318318
value: "true"
319319
- name: KUBERNETES_VERSION_UPGRADE_FROM
320-
value: "stable-1.33"
320+
value: "stable-1.34"
321321
- name: KUBERNETES_VERSION_UPGRADE_TO
322-
value: "ci/latest-1.34"
322+
value: "ci/latest-1.35"
323323
- name: ETCD_VERSION_UPGRADE_TO
324-
value: "3.6.1-1"
324+
value: "3.6.4-0"
325325
- name: COREDNS_VERSION_UPGRADE_TO
326326
value: "v1.12.1"
327327
- name: GINKGO_LABEL_FILTER
@@ -338,7 +338,7 @@ presubmits:
338338
memory: 6Gi
339339
annotations:
340340
testgrid-dashboards: cluster-api-core-main
341-
testgrid-tab-name: capi-pr-e2e-main-1-33-1-34
341+
testgrid-tab-name: capi-pr-e2e-main-1-34-1-35
342342
- name: pull-cluster-api-e2e-conformance-main
343343
cluster: eks-prow-build-cluster
344344
labels:
@@ -460,15 +460,15 @@ presubmits:
460460
- name: KIND_BUILD_IMAGES
461461
value: "KUBERNETES_VERSION_LATEST_CI"
462462
- name: KUBERNETES_VERSION_MANAGEMENT
463-
value: ci/latest-1.34
463+
value: ci/latest-1.35
464464
- name: KUBERNETES_VERSION
465-
value: ci/latest-1.34
465+
value: ci/latest-1.35
466466
- name: KUBERNETES_VERSION_UPGRADE_FROM
467-
value: stable-1.33
467+
value: stable-1.34
468468
- name: KUBERNETES_VERSION_UPGRADE_TO
469-
value: ci/latest-1.34
469+
value: ci/latest-1.35
470470
- name: ETCD_VERSION_UPGRADE_TO
471-
value: 3.6.1-1
471+
value: 3.6.4-0
472472
- name: COREDNS_VERSION_UPGRADE_TO
473473
value: v1.12.1
474474
# we need privileged mode in order to do docker in docker

‎config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ prow_ignored:
3535
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250815-171060767f-1.33"
3636
interval: "3h"
3737
upgradesInterval: "24h"
38-
kubernetesVersionManagement: "v1.30.10"
39-
kubebuilderEnvtestKubernetesVersion: "1.30.3"
38+
kubernetesVersionManagement: "v1.31.12"
39+
kubebuilderEnvtestKubernetesVersion: "1.31.0"
4040
upgrades:
41-
- from: "1.28"
42-
to: "1.29"
4341
- from: "1.29"
4442
to: "1.30"
4543
- from: "1.30"
@@ -50,6 +48,8 @@ prow_ignored:
5048
to: "1.33"
5149
- from: "1.33"
5250
to: "1.34"
51+
- from: "1.34"
52+
to: "1.35"
5353
release-1.11:
5454
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250815-171060767f-1.33"
5555
interval: "4h"
@@ -157,6 +157,10 @@ prow_ignored:
157157
coreDNS: "v1.12.0"
158158
k8sRelease: "stable-1.33"
159159
"1.34":
160-
etcd: "3.6.1-1"
160+
etcd: "3.6.4-0"
161+
coreDNS: "v1.12.1"
162+
k8sRelease: "stable-1.34"
163+
"1.35":
164+
etcd: "3.6.4-0"
161165
coreDNS: "v1.12.1"
162-
k8sRelease: "ci/latest-1.34"
166+
k8sRelease: "ci/latest-1.35"

‎config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-11-periodics-upgrades.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ periodics:
319319
- name: KUBERNETES_VERSION_UPGRADE_FROM
320320
value: "stable-1.33"
321321
- name: KUBERNETES_VERSION_UPGRADE_TO
322-
value: "ci/latest-1.34"
322+
value: "stable-1.34"
323323
- name: ETCD_VERSION_UPGRADE_TO
324-
value: "3.6.1-1"
324+
value: "3.6.4-0"
325325
- name: COREDNS_VERSION_UPGRADE_TO
326326
value: "v1.12.1"
327327
- name: GINKGO_LABEL_FILTER

‎config/jobs/kubernetes-sigs/cluster-api/cluster-api-release-1-11-presubmits.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ presubmits:
319319
- name: KUBERNETES_VERSION_UPGRADE_FROM
320320
value: "stable-1.33"
321321
- name: KUBERNETES_VERSION_UPGRADE_TO
322-
value: "ci/latest-1.34"
322+
value: "stable-1.34"
323323
- name: ETCD_VERSION_UPGRADE_TO
324-
value: "3.6.1-1"
324+
value: "3.6.4-0"
325325
- name: COREDNS_VERSION_UPGRADE_TO
326326
value: "v1.12.1"
327327
- name: GINKGO_LABEL_FILTER

0 commit comments

Comments
 (0)