Skip to content

Commit 3d6f78f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5455 from willie-yao/fix-dra-1.17
[release-1.17] fix: remove deprecated kube-apiserver cloud-provider arg
2 parents 02ca2f4 + 528dfc9 commit 3d6f78f

File tree

49 files changed

+36
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+36
-85
lines changed

‎templates/cluster-template-aad.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-azure-bastion.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-azure-cni-v1.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-clusterclass.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-dual-stack.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-edgezone.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-ephemeral.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-flatcar.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-ipv6.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-machinepool-windows.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-machinepool.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-nvidia-gpu.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-private.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template-windows.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/cluster-template.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ spec:
4848
kubeadmConfigSpec:
4949
clusterConfiguration:
5050
apiServer:
51-
extraArgs:
52-
cloud-provider: external
51+
extraArgs: {}
5352
timeoutForControlPlane: 20m
5453
controllerManager:
5554
extraArgs:

‎templates/flavors/base/cluster-template.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ spec:
5858
clusterConfiguration:
5959
apiServer:
6060
timeoutForControlPlane: 20m
61-
extraArgs:
62-
cloud-provider: external
61+
extraArgs: {}
6362
controllerManager:
6463
extraArgs:
6564
allocate-node-cidrs: "false"

‎templates/flavors/clusterclass/kubeadm-controlplane-template.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ spec:
99
kubeadmConfigSpec:
1010
clusterConfiguration:
1111
apiServer:
12-
extraArgs:
13-
cloud-provider: external
12+
extraArgs: {}
1413
timeoutForControlPlane: 20m
1514
controllerManager:
1615
extraArgs:

‎templates/test/ci/cluster-template-prow-azure-cni-v1.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version-dra.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ci-version.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-clusterclass-ci-default.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-custom-vnet.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-dual-stack.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-edgezone.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-flatcar.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-ipv6.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-load.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-machine-pool-flex.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-machine-pool.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-nvidia-gpu.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-private.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow-spot.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/ci/cluster-template-prow.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/dev/cluster-template-custom-builds-dra.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/dev/cluster-template-custom-builds-machine-pool.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/test/dev/cluster-template-custom-builds.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/data/infrastructure-azure/v1.15.3/cluster-template-prow.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/data/infrastructure-azure/v1.16.1/cluster-template-prow.yaml

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/data/infrastructure-azure/v1beta1/bases/cluster-with-kcp.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ spec:
7272
kubeadmConfigSpec:
7373
clusterConfiguration:
7474
apiServer:
75-
extraArgs:
76-
cloud-provider: external
75+
extraArgs: {}
7776
extraVolumes:
7877
- hostPath: /etc/kubernetes/azure.json
7978
mountPath: /etc/kubernetes/azure.json

0 commit comments

Comments
 (0)