Merge pull request #1526 from justinsb/dont_pass_deprecated_option

k8s-ci-robot · web-flow · commit 5085352a5763 · 2025-09-06T06:23:24.000-07:00
templates: don't pass cloud-provider to kube-apiserver
diff --git a/templates/cluster-template-clusterclass.yaml b/templates/cluster-template-clusterclass.yaml
@@ -121,8 +121,6 @@ spec:
         clusterConfiguration:
           apiServer:
             timeoutForControlPlane: 20m
-            extraArgs:
-              cloud-provider: gce
           controllerManager:
             extraArgs:
               cloud-provider: gce
diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -47,9 +47,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: gce
-          feature-gates: "DisableCloudProviders=false,DisableKubeletCloudCredentialProviders=false"
       controllerManager:
         extraArgs:
           cloud-provider: gce
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-creds.yaml
@@ -52,8 +52,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci-with-internal-lb.yaml
@@ -56,8 +56,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-ci.yaml
@@ -49,8 +49,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-kcp-remediation.yaml
@@ -48,8 +48,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-md-remediation.yaml
@@ -48,8 +48,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-prow-ci-version.yaml
@@ -50,8 +50,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml b/test/e2e/data/infrastructure-gcp/cluster-template-upgrades.yaml
@@ -48,8 +48,6 @@ spec:
     clusterConfiguration:
       apiServer:
         timeoutForControlPlane: 20m
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external
diff --git a/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-gcp/clusterclass-quick-start.yaml
@@ -120,8 +120,6 @@ spec:
         clusterConfiguration:
           apiServer:
             timeoutForControlPlane: 20m
-            extraArgs:
-              cloud-provider: external
           controllerManager:
             extraArgs:
               cloud-provider: external
