Skip to content

Commit 2350eec

Browse files
authored
Merge pull request #31248 from MartinForReal/revert-31109-revert-30642
Revert "Revert "Merge pull request #30642 from lzhecheng/cpa-master-k8s-ver-1.28""
2 parents ac22c2f + 90e7840 commit 2350eec

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ presubmits:
7070
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
7171
value: "1"
7272
- name: KUBERNETES_VERSION # CAPZ config
73-
value: "latest"
73+
value: "latest-1.28"
7474
- name: CLUSTER_TEMPLATE # CAPZ config
7575
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml
7676
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -229,7 +229,7 @@ presubmits:
229229
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
230230
value: "1"
231231
- name: KUBERNETES_VERSION # CAPZ config
232-
value: "latest"
232+
value: "latest-1.28"
233233
- name: ORCHESTRATION_MODE # CAPZ config
234234
value: "Flexible"
235235
- name: CLUSTER_TEMPLATE # CAPZ config
@@ -300,7 +300,7 @@ presubmits:
300300
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
301301
value: "standard"
302302
- name: KUBERNETES_VERSION # CAPZ config
303-
value: "latest"
303+
value: "latest-1.28"
304304
- name: GINKGO_ARGS # cloud-provider-azure config
305305
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
306306
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -358,7 +358,7 @@ presubmits:
358358
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
359359
value: "1"
360360
- name: KUBERNETES_VERSION # CAPZ config
361-
value: "latest"
361+
value: "latest-1.28"
362362
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
363363
value: "capz"
364364
annotations:
@@ -513,7 +513,7 @@ presubmits:
513513
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
514514
value: "1"
515515
- name: KUBERNETES_VERSION # CAPZ config
516-
value: "latest"
516+
value: "latest-1.28"
517517
- name: CLUSTER_TEMPLATE # CAPZ config
518518
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml
519519
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -579,7 +579,7 @@ presubmits:
579579
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
580580
value: "1"
581581
- name: KUBERNETES_VERSION # CAPZ config
582-
value: "latest"
582+
value: "latest-1.28"
583583
- name: CLUSTER_TEMPLATE # CAPZ config
584584
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-no-win.yaml
585585
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -898,7 +898,7 @@ periodics:
898898
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
899899
value: "1"
900900
- name: KUBERNETES_VERSION # CAPZ config
901-
value: "latest"
901+
value: "latest-1.28"
902902
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
903903
value: "capz"
904904
annotations:
@@ -950,7 +950,7 @@ periodics:
950950
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
951951
value: "1"
952952
- name: KUBERNETES_VERSION # CAPZ config
953-
value: "latest"
953+
value: "latest-1.28"
954954
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
955955
value: "capz"
956956
annotations:
@@ -1004,7 +1004,7 @@ periodics:
10041004
- name: TEST_WINDOWS # CAPZ config
10051005
value: "true"
10061006
- name: KUBERNETES_VERSION # CAPZ config
1007-
value: "latest"
1007+
value: "latest-1.28"
10081008
- name: WORKER_MACHINE_COUNT # CAPZ config
10091009
value: "0"
10101010
- name: CLUSTER_PROVISIONING_TOOL # cloud-provider-azure config
@@ -1063,7 +1063,7 @@ periodics:
10631063
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
10641064
value: "standard"
10651065
- name: KUBERNETES_VERSION # CAPZ config
1066-
value: "latest"
1066+
value: "latest-1.28"
10671067
- name: GINKGO_ARGS # cloud-provider-azure config
10681068
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
10691069
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1125,7 +1125,7 @@ periodics:
11251125
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
11261126
value: "standard"
11271127
- name: KUBERNETES_VERSION # CAPZ config
1128-
value: "latest"
1128+
value: "latest-1.28"
11291129
- name: GINKGO_ARGS # cloud-provider-azure config
11301130
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
11311131
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1194,7 +1194,7 @@ periodics:
11941194
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
11951195
value: "standard"
11961196
- name: KUBERNETES_VERSION # CAPZ config
1197-
value: "latest"
1197+
value: "latest-1.28"
11981198
- name: GINKGO_ARGS # cloud-provider-azure config
11991199
value: --ginkgo.focus=\[Slow\] --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|In-tree.Volumes --report-dir=/logs/artifacts --disable-log-dump=true
12001200
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1251,7 +1251,7 @@ periodics:
12511251
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
12521252
value: "1"
12531253
- name: KUBERNETES_VERSION # CAPZ config
1254-
value: "latest"
1254+
value: "latest-1.28"
12551255
- name: CLUSTER_TEMPLATE # CAPZ config
12561256
value: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml
12571257
- name: AZURE_LOADBALANCER_SKU # cloud-provider-azure config
@@ -1371,7 +1371,7 @@ periodics:
13711371
- name: TEST_CCM # CAPZ config
13721372
value: "true"
13731373
- name: KUBERNETES_VERSION # CAPZ config
1374-
value: "latest"
1374+
value: "latest-1.28"
13751375
- name: GINKGO_ARGS # cloud-provider-azure config
13761376
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
13771377
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config
@@ -1436,7 +1436,7 @@ periodics:
14361436
- name: TEST_CCM # CAPZ config
14371437
value: "true"
14381438
- name: KUBERNETES_VERSION # CAPZ config
1439-
value: "latest"
1439+
value: "latest-1.28"
14401440
- name: GINKGO_ARGS # cloud-provider-azure config
14411441
# Check https://github.com/kubernetes-sigs/cloud-provider-azure/issues/224 for the status of each skipped test
14421442
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
@@ -1504,7 +1504,7 @@ periodics:
15041504
- name: TEST_CCM # CAPZ config
15051505
value: "true"
15061506
- name: KUBERNETES_VERSION # CAPZ config
1507-
value: "latest"
1507+
value: "latest-1.28"
15081508
- name: GINKGO_ARGS # cloud-provider-azure config
15091509
# Check https://github.com/kubernetes-sigs/cloud-provider-azure/issues/224 for the status of each skipped test
15101510
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
@@ -1570,7 +1570,7 @@ periodics:
15701570
- name: TEST_CCM # CAPZ config
15711571
value: "true"
15721572
- name: KUBERNETES_VERSION # CAPZ config
1573-
value: "latest"
1573+
value: "latest-1.28"
15741574
- name: GINKGO_ARGS # cloud-provider-azure config
15751575
value: --ginkgo.focus=\[Slow\] --ginkgo.skip=\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|In-tree.Volumes --report-dir=/logs/artifacts --disable-log-dump=true
15761576
- name: CONTROL_PLANE_MACHINE_COUNT # CAPZ config

0 commit comments

Comments
 (0)