Skip to content

Commit 8fb5dc7

Browse files
authored
Merge pull request #35435 from fabriziopandini/bump-capv-1.34
Bump CAPV to v1.34
2 parents 0eb5d8f + f14e239 commit 8fb5dc7

5 files changed

+49
-47
lines changed

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

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
22
periodics:
33

4-
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
4+
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-31-1-32-main
55
cluster: k8s-infra-prow-build
66
cron: '0 1 * * *'
77
decorate: true
@@ -35,9 +35,9 @@ periodics:
3535
- name: GINKGO_FOCUS
3636
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
3737
- name: KUBERNETES_VERSION_UPGRADE_FROM
38-
value: "stable-1.30"
39-
- name: KUBERNETES_VERSION_UPGRADE_TO
4038
value: "stable-1.31"
39+
- name: KUBERNETES_VERSION_UPGRADE_TO
40+
value: "stable-1.32"
4141
# we need privileged mode in order to do docker in docker
4242
securityContext:
4343
privileged: true
@@ -52,11 +52,11 @@ periodics:
5252
memory: "6Gi"
5353
annotations:
5454
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
55-
testgrid-tab-name: periodic-e2e-govmomi-main-1-30-1-31
55+
testgrid-tab-name: periodic-e2e-govmomi-main-1-31-1-32
5656
testgrid-alert-email: [email protected]
5757
testgrid-num-failures-to-alert: "4"
5858

59-
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-31-1-32-main
59+
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-32-1-33-main
6060
cluster: k8s-infra-prow-build
6161
cron: '0 1 * * *'
6262
decorate: true
@@ -90,9 +90,9 @@ periodics:
9090
- name: GINKGO_FOCUS
9191
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
9292
- name: KUBERNETES_VERSION_UPGRADE_FROM
93-
value: "stable-1.31"
94-
- name: KUBERNETES_VERSION_UPGRADE_TO
9593
value: "stable-1.32"
94+
- name: KUBERNETES_VERSION_UPGRADE_TO
95+
value: "stable-1.33"
9696
# we need privileged mode in order to do docker in docker
9797
securityContext:
9898
privileged: true
@@ -107,11 +107,11 @@ periodics:
107107
memory: "6Gi"
108108
annotations:
109109
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
110-
testgrid-tab-name: periodic-e2e-govmomi-main-1-31-1-32
110+
testgrid-tab-name: periodic-e2e-govmomi-main-1-32-1-33
111111
testgrid-alert-email: [email protected]
112112
testgrid-num-failures-to-alert: "4"
113113

114-
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-32-1-33-main
114+
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-33-1-34-main
115115
cluster: k8s-infra-prow-build
116116
cron: '0 1 * * *'
117117
decorate: true
@@ -145,9 +145,9 @@ periodics:
145145
- name: GINKGO_FOCUS
146146
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
147147
- name: KUBERNETES_VERSION_UPGRADE_FROM
148-
value: "stable-1.32"
149-
- name: KUBERNETES_VERSION_UPGRADE_TO
150148
value: "stable-1.33"
149+
- name: KUBERNETES_VERSION_UPGRADE_TO
150+
value: "stable-1.34"
151151
# we need privileged mode in order to do docker in docker
152152
securityContext:
153153
privileged: true
@@ -162,11 +162,11 @@ periodics:
162162
memory: "6Gi"
163163
annotations:
164164
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
165-
testgrid-tab-name: periodic-e2e-govmomi-main-1-32-1-33
165+
testgrid-tab-name: periodic-e2e-govmomi-main-1-33-1-34
166166
testgrid-alert-email: [email protected]
167167
testgrid-num-failures-to-alert: "4"
168168

169-
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-33-1-34-main
169+
- name: periodic-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-34-1-35-main
170170
cluster: k8s-infra-prow-build
171171
cron: '0 1 * * *'
172172
decorate: true
@@ -200,9 +200,9 @@ periodics:
200200
- name: GINKGO_FOCUS
201201
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
202202
- name: KUBERNETES_VERSION_UPGRADE_FROM
203-
value: "stable-1.33"
203+
value: "stable-1.34"
204204
- name: KUBERNETES_VERSION_UPGRADE_TO
205-
value: "ci/latest-1.34"
205+
value: "ci/latest-1.35"
206206
# we need privileged mode in order to do docker in docker
207207
securityContext:
208208
privileged: true
@@ -217,11 +217,11 @@ periodics:
217217
memory: "6Gi"
218218
annotations:
219219
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
220-
testgrid-tab-name: periodic-e2e-govmomi-main-1-33-1-34
220+
testgrid-tab-name: periodic-e2e-govmomi-main-1-34-1-35
221221
testgrid-alert-email: [email protected]
222222
testgrid-num-failures-to-alert: "4"
223223

224-
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
224+
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-31-1-32-main
225225
cluster: k8s-infra-prow-build
226226
cron: '0 23 * * *'
227227
decorate: true
@@ -255,9 +255,9 @@ periodics:
255255
- name: GINKGO_FOCUS
256256
value: "\\[supervisor\\] \\[Conformance\\] \\[K8s-Upgrade\\]"
257257
- name: KUBERNETES_VERSION_UPGRADE_FROM
258-
value: "stable-1.30"
259-
- name: KUBERNETES_VERSION_UPGRADE_TO
260258
value: "stable-1.31"
259+
- name: KUBERNETES_VERSION_UPGRADE_TO
260+
value: "stable-1.32"
261261
# we need privileged mode in order to do docker in docker
262262
securityContext:
263263
privileged: true
@@ -272,11 +272,11 @@ periodics:
272272
memory: "6Gi"
273273
annotations:
274274
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
275-
testgrid-tab-name: periodic-e2e-supervisor-main-1-30-1-31
275+
testgrid-tab-name: periodic-e2e-supervisor-main-1-31-1-32
276276
testgrid-alert-email: [email protected]
277277
testgrid-num-failures-to-alert: "4"
278278

279-
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-31-1-32-main
279+
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-32-1-33-main
280280
cluster: k8s-infra-prow-build
281281
cron: '0 23 * * *'
282282
decorate: true
@@ -310,9 +310,9 @@ periodics:
310310
- name: GINKGO_FOCUS
311311
value: "\\[supervisor\\] \\[Conformance\\] \\[K8s-Upgrade\\]"
312312
- name: KUBERNETES_VERSION_UPGRADE_FROM
313-
value: "stable-1.31"
314-
- name: KUBERNETES_VERSION_UPGRADE_TO
315313
value: "stable-1.32"
314+
- name: KUBERNETES_VERSION_UPGRADE_TO
315+
value: "stable-1.33"
316316
# we need privileged mode in order to do docker in docker
317317
securityContext:
318318
privileged: true
@@ -327,11 +327,11 @@ periodics:
327327
memory: "6Gi"
328328
annotations:
329329
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
330-
testgrid-tab-name: periodic-e2e-supervisor-main-1-31-1-32
330+
testgrid-tab-name: periodic-e2e-supervisor-main-1-32-1-33
331331
testgrid-alert-email: [email protected]
332332
testgrid-num-failures-to-alert: "4"
333333

334-
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-32-1-33-main
334+
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-33-1-34-main
335335
cluster: k8s-infra-prow-build
336336
cron: '0 23 * * *'
337337
decorate: true
@@ -365,9 +365,9 @@ periodics:
365365
- name: GINKGO_FOCUS
366366
value: "\\[supervisor\\] \\[Conformance\\] \\[K8s-Upgrade\\]"
367367
- name: KUBERNETES_VERSION_UPGRADE_FROM
368-
value: "stable-1.32"
369-
- name: KUBERNETES_VERSION_UPGRADE_TO
370368
value: "stable-1.33"
369+
- name: KUBERNETES_VERSION_UPGRADE_TO
370+
value: "stable-1.34"
371371
# we need privileged mode in order to do docker in docker
372372
securityContext:
373373
privileged: true
@@ -382,11 +382,11 @@ periodics:
382382
memory: "6Gi"
383383
annotations:
384384
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
385-
testgrid-tab-name: periodic-e2e-supervisor-main-1-32-1-33
385+
testgrid-tab-name: periodic-e2e-supervisor-main-1-33-1-34
386386
testgrid-alert-email: [email protected]
387387
testgrid-num-failures-to-alert: "4"
388388

389-
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-33-1-34-main
389+
- name: periodic-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-34-1-35-main
390390
cluster: k8s-infra-prow-build
391391
cron: '0 23 * * *'
392392
decorate: true
@@ -420,9 +420,9 @@ periodics:
420420
- name: GINKGO_FOCUS
421421
value: "\\[supervisor\\] \\[Conformance\\] \\[K8s-Upgrade\\]"
422422
- name: KUBERNETES_VERSION_UPGRADE_FROM
423-
value: "stable-1.33"
423+
value: "stable-1.34"
424424
- name: KUBERNETES_VERSION_UPGRADE_TO
425-
value: "ci/latest-1.34"
425+
value: "ci/latest-1.35"
426426
# we need privileged mode in order to do docker in docker
427427
securityContext:
428428
privileged: true
@@ -437,6 +437,6 @@ periodics:
437437
memory: "6Gi"
438438
annotations:
439439
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
440-
testgrid-tab-name: periodic-e2e-supervisor-main-1-33-1-34
440+
testgrid-tab-name: periodic-e2e-supervisor-main-1-34-1-35
441441
testgrid-alert-email: [email protected]
442442
testgrid-num-failures-to-alert: "4"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ presubmits:
234234
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
235235
testgrid-tab-name: pr-e2e-vcsim-govmomi-main
236236
description: Runs e2e tests with vcsim / govmomi mode
237-
- name: pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-33-1-34-main
237+
- name: pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-34-1-35-main
238238
cluster: k8s-infra-prow-build
239239
labels:
240240
preset-dind-enabled: "true"
@@ -264,9 +264,9 @@ presubmits:
264264
- name: GINKGO_FOCUS
265265
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
266266
- name: KUBERNETES_VERSION_UPGRADE_FROM
267-
value: "stable-1.33"
267+
value: "stable-1.34"
268268
- name: KUBERNETES_VERSION_UPGRADE_TO
269-
value: "ci/latest-1.34"
269+
value: "ci/latest-1.35"
270270
# we need privileged mode in order to do docker in docker
271271
securityContext:
272272
privileged: true
@@ -281,7 +281,7 @@ presubmits:
281281
memory: "6Gi"
282282
annotations:
283283
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
284-
testgrid-tab-name: pr-e2e-govmomi-main-1-33-1-34
284+
testgrid-tab-name: pr-e2e-govmomi-main-1-34-1-35
285285
- name: pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
286286
cluster: k8s-infra-prow-build
287287
branches:
@@ -513,7 +513,7 @@ presubmits:
513513
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
514514
testgrid-tab-name: pr-e2e-vcsim-supervisor-main
515515
description: Runs e2e tests with vcsim / govmomi mode
516-
- name: pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-33-1-34-main
516+
- name: pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-34-1-35-main
517517
cluster: k8s-infra-prow-build
518518
labels:
519519
preset-dind-enabled: "true"
@@ -543,9 +543,9 @@ presubmits:
543543
- name: GINKGO_FOCUS
544544
value: "\\[supervisor\\] \\[Conformance\\] \\[K8s-Upgrade\\]"
545545
- name: KUBERNETES_VERSION_UPGRADE_FROM
546-
value: "stable-1.33"
546+
value: "stable-1.34"
547547
- name: KUBERNETES_VERSION_UPGRADE_TO
548-
value: "ci/latest-1.34"
548+
value: "ci/latest-1.35"
549549
# we need privileged mode in order to do docker in docker
550550
securityContext:
551551
privileged: true
@@ -560,7 +560,7 @@ presubmits:
560560
memory: "6Gi"
561561
annotations:
562562
testgrid-dashboards: vmware-cluster-api-provider-vsphere, sig-cluster-lifecycle-cluster-api-provider-vsphere
563-
testgrid-tab-name: pr-e2e-supervisor-main-1-33-1-34
563+
testgrid-tab-name: pr-e2e-supervisor-main-1-34-1-35
564564
- name: pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
565565
cluster: k8s-infra-prow-build
566566
branches:

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ prow_ignored:
1313
# interval for coverage job
1414
interval: "24h"
1515
upgrades:
16-
- from: "1.30"
17-
to: "1.31"
1816
- from: "1.31"
1917
to: "1.32"
2018
- from: "1.32"
2119
to: "1.33"
2220
- from: "1.33"
2321
to: "1.34"
22+
- from: "1.34"
23+
to: "1.35"
2424
release-1.14:
2525
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250815-171060767f-1.33"
2626
upgrades:
@@ -80,4 +80,6 @@ prow_ignored:
8080
"1.33":
8181
k8sRelease: "stable-1.33"
8282
"1.34":
83-
k8sRelease: "ci/latest-1.34"
83+
k8sRelease: "stable-1.34"
84+
"1.35":
85+
k8sRelease: "ci/latest-1.35"

config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-14-periodics-upgrades.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ periodics:
202202
- name: KUBERNETES_VERSION_UPGRADE_FROM
203203
value: "stable-1.33"
204204
- name: KUBERNETES_VERSION_UPGRADE_TO
205-
value: "ci/latest-1.34"
205+
value: "stable-1.34"
206206
# we need privileged mode in order to do docker in docker
207207
securityContext:
208208
privileged: true
@@ -422,7 +422,7 @@ periodics:
422422
- name: KUBERNETES_VERSION_UPGRADE_FROM
423423
value: "stable-1.33"
424424
- name: KUBERNETES_VERSION_UPGRADE_TO
425-
value: "ci/latest-1.34"
425+
value: "stable-1.34"
426426
# we need privileged mode in order to do docker in docker
427427
securityContext:
428428
privileged: true

config/jobs/kubernetes-sigs/cluster-api-provider-vsphere/cluster-api-provider-vsphere-release-1-14-presubmits.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ presubmits:
266266
- name: KUBERNETES_VERSION_UPGRADE_FROM
267267
value: "stable-1.33"
268268
- name: KUBERNETES_VERSION_UPGRADE_TO
269-
value: "ci/latest-1.34"
269+
value: "stable-1.34"
270270
# we need privileged mode in order to do docker in docker
271271
securityContext:
272272
privileged: true
@@ -545,7 +545,7 @@ presubmits:
545545
- name: KUBERNETES_VERSION_UPGRADE_FROM
546546
value: "stable-1.33"
547547
- name: KUBERNETES_VERSION_UPGRADE_TO
548-
value: "ci/latest-1.34"
548+
value: "stable-1.34"
549549
# we need privileged mode in order to do docker in docker
550550
securityContext:
551551
privileged: true

0 commit comments

Comments
 (0)