Skip to content

Commit eae0ea4

Browse files
chrischdichrischdi
committed
CAPI: adjust jobs due to v1.32 GA
1 parent c2448a5 commit eae0ea4

6 files changed

+62
-58
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-26-1-27-main
3+
- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-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.26"
36-
- name: KUBERNETES_VERSION_UPGRADE_TO
3735
value: "stable-1.27"
36+
- name: KUBERNETES_VERSION_UPGRADE_TO
37+
value: "stable-1.28"
3838
- name: ETCD_VERSION_UPGRADE_TO
39-
value: "3.5.6-0"
39+
value: "3.5.9-0"
4040
- name: COREDNS_VERSION_UPGRADE_TO
41-
value: "v1.9.3"
41+
value: "v1.10.1"
4242
- name: GINKGO_FOCUS
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: sig-cluster-lifecycle-cluster-api
56-
testgrid-tab-name: capi-e2e-main-1-26-1-27
56+
testgrid-tab-name: capi-e2e-main-1-27-1-28
5757
testgrid-alert-email: [email protected]
5858
testgrid-num-failures-to-alert: "4"
5959

60-
- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-main
60+
- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-main
6161
cluster: eks-prow-build-cluster
6262
interval: 24h
6363
decorate: true
@@ -89,13 +89,13 @@ periodics:
8989
- name: ALWAYS_BUILD_KIND_IMAGES
9090
value: "true"
9191
- name: KUBERNETES_VERSION_UPGRADE_FROM
92-
value: "stable-1.27"
93-
- name: KUBERNETES_VERSION_UPGRADE_TO
9492
value: "stable-1.28"
93+
- name: KUBERNETES_VERSION_UPGRADE_TO
94+
value: "stable-1.29"
9595
- name: ETCD_VERSION_UPGRADE_TO
96-
value: "3.5.9-0"
96+
value: "3.5.10-0"
9797
- name: COREDNS_VERSION_UPGRADE_TO
98-
value: "v1.10.1"
98+
value: "v1.11.1"
9999
- name: GINKGO_FOCUS
100100
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
101101
# we need privileged mode in order to do docker in docker
@@ -110,11 +110,11 @@ periodics:
110110
memory: 6Gi
111111
annotations:
112112
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
113-
testgrid-tab-name: capi-e2e-main-1-27-1-28
113+
testgrid-tab-name: capi-e2e-main-1-28-1-29
114114
testgrid-alert-email: [email protected]
115115
testgrid-num-failures-to-alert: "4"
116116

117-
- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-main
117+
- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-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.28"
150-
- name: KUBERNETES_VERSION_UPGRADE_TO
151149
value: "stable-1.29"
150+
- name: KUBERNETES_VERSION_UPGRADE_TO
151+
value: "stable-1.30"
152152
- name: ETCD_VERSION_UPGRADE_TO
153-
value: "3.5.10-0"
153+
value: "3.5.12-0"
154154
- name: COREDNS_VERSION_UPGRADE_TO
155155
value: "v1.11.1"
156156
- name: GINKGO_FOCUS
@@ -167,11 +167,11 @@ periodics:
167167
memory: 6Gi
168168
annotations:
169169
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
170-
testgrid-tab-name: capi-e2e-main-1-28-1-29
170+
testgrid-tab-name: capi-e2e-main-1-29-1-30
171171
testgrid-alert-email: [email protected]
172172
testgrid-num-failures-to-alert: "4"
173173

174-
- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-main
174+
- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-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.29"
207-
- name: KUBERNETES_VERSION_UPGRADE_TO
208206
value: "stable-1.30"
207+
- name: KUBERNETES_VERSION_UPGRADE_TO
208+
value: "stable-1.31"
209209
- name: ETCD_VERSION_UPGRADE_TO
210-
value: "3.5.12-0"
210+
value: "3.5.15-0"
211211
- name: COREDNS_VERSION_UPGRADE_TO
212-
value: "v1.11.1"
212+
value: "v1.11.3"
213213
- name: GINKGO_FOCUS
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: sig-cluster-lifecycle-cluster-api
227-
testgrid-tab-name: capi-e2e-main-1-29-1-30
227+
testgrid-tab-name: capi-e2e-main-1-30-1-31
228228
testgrid-alert-email: [email protected]
229229
testgrid-num-failures-to-alert: "4"
230230

231-
- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-main
231+
- name: periodic-cluster-api-e2e-upgrade-1-31-1-32-main
232232
cluster: eks-prow-build-cluster
233233
interval: 24h
234234
decorate: true
@@ -260,9 +260,9 @@ periodics:
260260
- name: ALWAYS_BUILD_KIND_IMAGES
261261
value: "true"
262262
- name: KUBERNETES_VERSION_UPGRADE_FROM
263-
value: "stable-1.30"
264-
- name: KUBERNETES_VERSION_UPGRADE_TO
265263
value: "stable-1.31"
264+
- name: KUBERNETES_VERSION_UPGRADE_TO
265+
value: "stable-1.32"
266266
- name: ETCD_VERSION_UPGRADE_TO
267267
value: "3.5.15-0"
268268
- name: COREDNS_VERSION_UPGRADE_TO
@@ -281,11 +281,11 @@ periodics:
281281
memory: 6Gi
282282
annotations:
283283
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
284-
testgrid-tab-name: capi-e2e-main-1-30-1-31
284+
testgrid-tab-name: capi-e2e-main-1-31-1-32
285285
testgrid-alert-email: [email protected]
286286
testgrid-num-failures-to-alert: "4"
287287

288-
- name: periodic-cluster-api-e2e-upgrade-1-31-1-32-main
288+
- name: periodic-cluster-api-e2e-upgrade-1-32-1-33-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.31"
320+
value: "stable-1.32"
321321
- name: KUBERNETES_VERSION_UPGRADE_TO
322-
value: "ci/latest-1.32"
322+
value: "ci/latest-1.33"
323323
- name: ETCD_VERSION_UPGRADE_TO
324-
value: "3.5.15-0"
324+
value: "3.5.16-0"
325325
- name: COREDNS_VERSION_UPGRADE_TO
326326
value: "v1.11.3"
327327
- name: GINKGO_FOCUS
@@ -338,6 +338,6 @@ periodics:
338338
memory: 6Gi
339339
annotations:
340340
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
341-
testgrid-tab-name: capi-e2e-main-1-31-1-32
341+
testgrid-tab-name: capi-e2e-main-1-32-1-33
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.28.3"
66+
value: "1.29.5"
6767
resources:
6868
requests:
6969
cpu: 7300m
@@ -166,7 +166,7 @@ periodics:
166166
# Please also make sure to refer a version where a kindest/node image exists
167167
# for (see https://github.com/kubernetes-sigs/kind/releases/)
168168
- name: KUBERNETES_VERSION_MANAGEMENT
169-
value: "v1.28.9"
169+
value: "v1.29.10"
170170
# we need privileged mode in order to do docker in docker
171171
securityContext:
172172
privileged: true
@@ -311,15 +311,15 @@ periodics:
311311
- name: GINKGO_SKIP
312312
value: "\\[Conformance\\]"
313313
- name: KUBERNETES_VERSION_MANAGEMENT
314-
value: ci/latest-1.32
314+
value: ci/latest-1.33
315315
- name: KUBERNETES_VERSION
316-
value: ci/latest-1.32
316+
value: ci/latest-1.33
317317
- name: KUBERNETES_VERSION_UPGRADE_FROM
318-
value: stable-1.31
318+
value: stable-1.32
319319
- name: KUBERNETES_VERSION_UPGRADE_TO
320-
value: ci/latest-1.32
320+
value: ci/latest-1.33
321321
- name: ETCD_VERSION_UPGRADE_TO
322-
value: 3.5.15-0
322+
value: 3.5.16-0
323323
- name: COREDNS_VERSION_UPGRADE_TO
324324
value: v1.11.3
325325
# 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.28.3"
138+
value: "1.29.5"
139139
resources:
140140
requests:
141141
cpu: 7300m
@@ -183,7 +183,7 @@ presubmits:
183183
# Please also make sure to refer a version where a kindest/node image exists
184184
# for (see https://github.com/kubernetes-sigs/kind/releases/)
185185
- name: KUBERNETES_VERSION_MANAGEMENT
186-
value: "v1.28.9"
186+
value: "v1.29.10"
187187
# we need privileged mode in order to do docker in docker
188188
securityContext:
189189
privileged: true
@@ -280,7 +280,7 @@ presubmits:
280280
annotations:
281281
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
282282
testgrid-tab-name: capi-pr-e2e-main
283-
- name: pull-cluster-api-e2e-upgrade-1-31-1-32-main
283+
- name: pull-cluster-api-e2e-upgrade-1-32-1-33-main
284284
cluster: eks-prow-build-cluster
285285
labels:
286286
preset-dind-enabled: "true"
@@ -308,11 +308,11 @@ presubmits:
308308
- name: ALWAYS_BUILD_KIND_IMAGES
309309
value: "true"
310310
- name: KUBERNETES_VERSION_UPGRADE_FROM
311-
value: "stable-1.31"
311+
value: "stable-1.32"
312312
- name: KUBERNETES_VERSION_UPGRADE_TO
313-
value: "ci/latest-1.32"
313+
value: "ci/latest-1.33"
314314
- name: ETCD_VERSION_UPGRADE_TO
315-
value: "3.5.15-0"
315+
value: "3.5.16-0"
316316
- name: COREDNS_VERSION_UPGRADE_TO
317317
value: "v1.11.3"
318318
- name: GINKGO_FOCUS
@@ -329,7 +329,7 @@ presubmits:
329329
memory: 6Gi
330330
annotations:
331331
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
332-
testgrid-tab-name: capi-pr-e2e-main-1-31-1-32
332+
testgrid-tab-name: capi-pr-e2e-main-1-32-1-33
333333

334334
- name: pull-cluster-api-e2e-conformance-main
335335
cluster: eks-prow-build-cluster
@@ -443,15 +443,15 @@ presubmits:
443443
- name: GINKGO_SKIP
444444
value: "\\[Conformance\\]"
445445
- name: KUBERNETES_VERSION_MANAGEMENT
446-
value: ci/latest-1.32
446+
value: ci/latest-1.33
447447
- name: KUBERNETES_VERSION
448-
value: ci/latest-1.32
448+
value: ci/latest-1.33
449449
- name: KUBERNETES_VERSION_UPGRADE_FROM
450-
value: stable-1.31
450+
value: stable-1.32
451451
- name: KUBERNETES_VERSION_UPGRADE_TO
452-
value: ci/latest-1.32
452+
value: ci/latest-1.33
453453
- name: ETCD_VERSION_UPGRADE_TO
454-
value: 3.5.15-0
454+
value: 3.5.16-0
455455
- name: COREDNS_VERSION_UPGRADE_TO
456456
value: v1.11.3
457457
# we need privileged mode in order to do docker in docker

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

Lines changed: 9 additions & 5 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:v20241128-8df65c072f-1.31"
3636
interval: "3h"
3737
upgradesInterval: "24h"
38-
kubernetesVersionManagement: "v1.28.9"
39-
kubebuilderEnvtestKubernetesVersion: "1.28.3"
38+
kubernetesVersionManagement: "v1.29.10"
39+
kubebuilderEnvtestKubernetesVersion: "1.29.5"
4040
upgrades:
41-
- from: "1.26"
42-
to: "1.27"
4341
- from: "1.27"
4442
to: "1.28"
4543
- from: "1.28"
@@ -50,6 +48,8 @@ prow_ignored:
5048
to: "1.31"
5149
- from: "1.31"
5250
to: "1.32"
51+
- from: "1.32"
52+
to: "1.33"
5353
release-1.9:
5454
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241128-8df65c072f-1.31"
5555
interval: "4h"
@@ -155,4 +155,8 @@ prow_ignored:
155155
"1.32":
156156
etcd: "3.5.15-0"
157157
coreDNS: "v1.11.3"
158-
k8sRelease: "ci/latest-1.32"
158+
k8sRelease: "stable-1.32"
159+
"1.33":
160+
etcd: "3.5.16-0"
161+
coreDNS: "v1.11.3"
162+
k8sRelease: "ci/latest-1.33"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ periodics:
319319
- name: KUBERNETES_VERSION_UPGRADE_FROM
320320
value: "stable-1.31"
321321
- name: KUBERNETES_VERSION_UPGRADE_TO
322-
value: "ci/latest-1.32"
322+
value: "stable-1.32"
323323
- name: ETCD_VERSION_UPGRADE_TO
324324
value: "3.5.15-0"
325325
- name: COREDNS_VERSION_UPGRADE_TO

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ presubmits:
310310
- name: KUBERNETES_VERSION_UPGRADE_FROM
311311
value: "stable-1.31"
312312
- name: KUBERNETES_VERSION_UPGRADE_TO
313-
value: "ci/latest-1.32"
313+
value: "stable-1.32"
314314
- name: ETCD_VERSION_UPGRADE_TO
315315
value: "3.5.15-0"
316316
- name: COREDNS_VERSION_UPGRADE_TO

0 commit comments

Comments
 (0)