Skip to content

Commit 0068189

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #34893 from nilo19/fix/azure-master-2
fix: Change cloud provider azure master jobs to use kubernetes v1.33
2 parents 6003c36 + d9e3d00 commit 0068189

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

‎config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ presubmits:
7171
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
7272
value: "1"
7373
- name: KUBERNETES_VERSION # CAPZ config
74-
value: "latest"
74+
value: "latest-1.33"
7575
- name: CLUSTER_TEMPLATE # CAPZ config
7676
value: https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/release-1.18/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
7777
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -131,7 +131,7 @@ presubmits:
131131
value: "1"
132132
# TODO: Should use a 1.29 K8s version
133133
- name: KUBERNETES_VERSION # CAPZ config
134-
value: "latest"
134+
value: "latest-1.33"
135135
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
136136
value: "Standard"
137137
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
@@ -190,7 +190,7 @@ presubmits:
190190
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
191191
value: "1"
192192
- name: KUBERNETES_VERSION # CAPZ config
193-
value: "latest"
193+
value: "latest-1.33"
194194
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
195195
value: "Standard"
196196
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
@@ -252,7 +252,7 @@ presubmits:
252252
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
253253
value: "1"
254254
- name: KUBERNETES_VERSION # CAPZ config
255-
value: "latest"
255+
value: "latest-1.33"
256256
- name: ORCHESTRATION_MODE # CAPZ config
257257
value: "Flexible"
258258
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -332,7 +332,7 @@ presubmits:
332332
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
333333
value: "standard"
334334
- name: KUBERNETES_VERSION # CAPZ config
335-
value: "latest"
335+
value: "latest-1.33"
336336
- name: GINKGO_ARGS # cloud-provider-azure config
337337
value: --ginkgo.focus=\[Conformance\]|\[NodeConformance\] --ginkgo.skip=\[Slow\]|\[Serial\]|\[Flaky\]|Should.be.able.to.support.the.1\.17.Sample.API.Server.using.the.current.Aggregator --report-dir=/logs/artifacts --disable-log-dump=true
338338
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -400,7 +400,7 @@ presubmits:
400400
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
401401
value: "1"
402402
- name: KUBERNETES_VERSION # CAPZ config
403-
value: "latest"
403+
value: "latest-1.33"
404404
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
405405
value: "capz"
406406
resources:
@@ -458,7 +458,7 @@ presubmits:
458458
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
459459
value: "1"
460460
- name: KUBERNETES_VERSION # CAPZ config
461-
value: "latest"
461+
value: "latest-1.33"
462462
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
463463
value: "capz"
464464
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -518,7 +518,7 @@ presubmits:
518518
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
519519
value: "1"
520520
- name: KUBERNETES_VERSION # CAPZ config
521-
value: "latest"
521+
value: "latest-1.33"
522522
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
523523
value: "capz"
524524
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -576,7 +576,7 @@ presubmits:
576576
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
577577
value: "1"
578578
- name: KUBERNETES_VERSION # CAPZ config
579-
value: "latest"
579+
value: "latest-1.33"
580580
- name: CLUSTER_TEMPLATE # CAPZ config
581581
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version-oot-credential-provider.yaml
582582
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -652,7 +652,7 @@ presubmits:
652652
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
653653
value: "1"
654654
- name: KUBERNETES_VERSION # CAPZ config
655-
value: "latest"
655+
value: "latest-1.33"
656656
- name: CLUSTER_TEMPLATE # CAPZ config
657657
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-no-win-oot-credential-provider.yaml
658658
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -753,7 +753,7 @@ presubmits:
753753
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
754754
value: "1"
755755
- name: KUBERNETES_VERSION # CAPZ config
756-
value: "latest"
756+
value: "latest-1.33"
757757
- name: CLUSTER_TEMPLATE # CAPZ config
758758
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version-oot-credential-provider.yaml
759759
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -834,7 +834,7 @@ periodics:
834834
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
835835
value: "1"
836836
- name: KUBERNETES_VERSION # CAPZ config
837-
value: "latest"
837+
value: "latest-1.33"
838838
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
839839
value: "capz"
840840
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -896,7 +896,7 @@ periodics:
896896
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
897897
value: "1"
898898
- name: KUBERNETES_VERSION # CAPZ config
899-
value: "latest"
899+
value: "latest-1.33"
900900
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
901901
value: "capz"
902902
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -958,7 +958,7 @@ periodics:
958958
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
959959
value: "1"
960960
- name: KUBERNETES_VERSION # CAPZ config
961-
value: "latest"
961+
value: "latest-1.33"
962962
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
963963
value: "capz"
964964
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -1020,7 +1020,7 @@ periodics:
10201020
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
10211021
value: "1"
10221022
- name: KUBERNETES_VERSION # CAPZ config
1023-
value: "latest"
1023+
value: "latest-1.33"
10241024
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
10251025
value: "capz"
10261026
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -1082,7 +1082,7 @@ periodics:
10821082
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
10831083
value: "1"
10841084
- name: KUBERNETES_VERSION # CAPZ config
1085-
value: "latest"
1085+
value: "latest-1.33"
10861086
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
10871087
value: "capz"
10881088
resources:
@@ -1142,7 +1142,7 @@ periodics:
11421142
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
11431143
value: "1"
11441144
- name: KUBERNETES_VERSION # CAPZ config
1145-
value: "latest"
1145+
value: "latest-1.33"
11461146
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
11471147
value: "capz"
11481148
resources:
@@ -1203,7 +1203,7 @@ periodics:
12031203
- name: TEST_WINDOWS # CAPZ config
12041204
value: "true"
12051205
- name: KUBERNETES_VERSION # CAPZ config
1206-
value: "latest"
1206+
value: "latest-1.33"
12071207
- name: WORKER_MACHINE_COUNT # CAPZ config
12081208
value: "0"
12091209
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
@@ -1269,7 +1269,7 @@ periodics:
12691269
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
12701270
value: "standard"
12711271
- name: KUBERNETES_VERSION # CAPZ config
1272-
value: "latest"
1272+
value: "latest-1.33"
12731273
- name: GINKGO_ARGS # cloud-provider-azure config
12741274
value: --ginkgo.focus=\[Conformance\]|\[NodeConformance\] --ginkgo.skip=\[Slow\]|\[Serial\]|\[Flaky\]|Should.be.able.to.support.the.1\.17.Sample.API.Server.using.the.current.Aggregator --report-dir=/logs/artifacts --disable-log-dump=true
12751275
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1338,7 +1338,7 @@ periodics:
13381338
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
13391339
value: "standard"
13401340
- name: KUBERNETES_VERSION # CAPZ config
1341-
value: "latest"
1341+
value: "latest-1.33"
13421342
- name: GINKGO_ARGS # cloud-provider-azure config
13431343
value: --ginkgo.focus=\[Conformance\]|\[NodeConformance\] --ginkgo.skip=\[Slow\]|\[Serial\]|\[Flaky\]|\[LinuxOnly\]|Should.be.able.to.support.the.1\.17.Sample.API.Server.using.the.current.Aggregator --node-os-distro=windows --report-dir=/logs/artifacts --disable-log-dump=true
13441344
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1412,7 +1412,7 @@ periodics:
14121412
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
14131413
value: "standard"
14141414
- name: KUBERNETES_VERSION # CAPZ config
1415-
value: "latest"
1415+
value: "latest-1.33"
14161416
- name: GINKGO_ARGS # cloud-provider-azure config
14171417
value: --ginkgo.focus=\[Slow\] --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|In-tree.Volumes --report-dir=/logs/artifacts --disable-log-dump=true
14181418
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1476,7 +1476,7 @@ periodics:
14761476
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
14771477
value: "1"
14781478
- name: KUBERNETES_VERSION # CAPZ config
1479-
value: "latest"
1479+
value: "latest-1.33"
14801480
- name: CLUSTER_TEMPLATE # CAPZ config
14811481
value: https://raw.githubusercontent.com/kubernetes-sigs/cluster-api-provider-azure/release-1.18/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml
14821482
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -1542,7 +1542,7 @@ periodics:
15421542
- name: TEST_CCM # CAPZ config
15431543
value: "true"
15441544
- name: KUBERNETES_VERSION # CAPZ config
1545-
value: "latest"
1545+
value: "latest-1.33"
15461546
- name: GINKGO_ARGS # cloud-provider-azure config
15471547
value: --ginkgo.focus=\[Conformance\]|\[NodeConformance\] --ginkgo.skip=\[Slow\]|\[Serial\]|\[Flaky\]|Should.be.able.to.support.the.1\.17.Sample.API.Server.using.the.current.Aggregator --report-dir=/logs/artifacts --disable-log-dump=true
15481548
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1614,7 +1614,7 @@ periodics:
16141614
- name: TEST_CCM # CAPZ config
16151615
value: "true"
16161616
- name: KUBERNETES_VERSION # CAPZ config
1617-
value: "latest"
1617+
value: "latest-1.33"
16181618
- name: GINKGO_ARGS # cloud-provider-azure config
16191619
# Check https://github.com/kubernetes-sigs/cloud-provider-azure/issues/224 for the status of each skipped test
16201620
value: --ginkgo.focus=\[Serial\]|\[Disruptive\] --ginkgo.skip=\[Flaky\]|\[Feature:.+\]|regular.resource.usage.tracking.resource.tracking.for|validates.MaxPods.limit.number.of.pods.that.are.allowed.to.run|In-tree.Volumes|RuntimeClass.should.run.a.Pod.requesting.a.RuntimeClass.with.scheduling.with.taints|Multi-AZ.Clusters.should.spread.the.pods.of.a.replication.controller.across.zones|Multi-AZ.Clusters.should.spread.the.pods.of.a.service.across.zones|Should.test.that.pv.used.in.a.pod.that.is.deleted.while.the.kubelet.is.down.cleans.up.when.the.kubelet.returns|Should.test.that.pv.used.in.a.pod.that.is.force.deleted.while.the.kubelet.is.down.cleans.up.when.the.kubelet.returns|Should.test.that.pv.written.before.kubelet.restart.is.readable.after.restart|subPath.should.unmount.if.pod.is.force.deleted.while.kubelet.is.down|subPath.should.unmount.if.pod.is.gracefully.deleted.while.kubelet.is.down|Should.test.that.pv.written.before.kubelet.restart.is.readable.after.restart|Kube-proxy.should.recover.after.being.killed.accidentally|Kubelet.should.not.restart.containers.across.restart --report-dir=/logs/artifacts --disable-log-dump=true
@@ -1687,7 +1687,7 @@ periodics:
16871687
- name: TEST_CCM # CAPZ config
16881688
value: "true"
16891689
- name: KUBERNETES_VERSION # CAPZ config
1690-
value: "latest"
1690+
value: "latest-1.33"
16911691
- name: GINKGO_ARGS # cloud-provider-azure config
16921692
# Check https://github.com/kubernetes-sigs/cloud-provider-azure/issues/224 for the status of each skipped test
16931693
value: --ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|Delete.Grace.Period|runs.ReplicaSets.to.verify.preemption.running.path|client.go.should.negotiate|should.contain.custom.columns.for.each.resource|Network.should.set.TCP.CLOSE_WAIT.timeout|PodSecurityPolicy|In-tree.Volumes|ephemeral.should.support.expansion.of.pvcs.created.for.ephemeral.pvcs|Should.be.able.to.support.the.1\.17.Sample.API.Server.using.the.current.Aggregator --report-dir=/logs/artifacts --disable-log-dump=true
@@ -1764,7 +1764,7 @@ periodics:
17641764
- name: TEST_CCM # CAPZ config
17651765
value: "true"
17661766
- name: KUBERNETES_VERSION # CAPZ config
1767-
value: "latest"
1767+
value: "latest-1.33"
17681768
- name: GINKGO_ARGS # cloud-provider-azure config
17691769
value: --ginkgo.focus=\[Slow\] --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|In-tree.Volumes --report-dir=/logs/artifacts --disable-log-dump=true
17701770
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config

0 commit comments

Comments
 (0)