Merge pull request #3365 from chrischdi/pr-fix-v1-33-cloud-provider-flag-removal

🌱 templates: remove cloud-provider flag for kube-apiserver due to removal in v1.33

Author: k8s-ci-robot

packaging/flavorgen/flavors/generators.go

@@ -451,10 +451,11 @@ func defaultKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfigS
 			NodeRegistration: defaultNodeRegistrationOptions(),
 		},
 		ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
-			APIServer: bootstrapv1.APIServer{
-				ControlPlaneComponent: defaultControlPlaneComponent(),
+			ControllerManager: bootstrapv1.ControlPlaneComponent{
+				ExtraArgs: map[string]string{
+					"cloud-provider": "external",
+				},
 			},
-			ControllerManager: defaultControlPlaneComponent(),
 		},
 		Users:              defaultUsers(),
 		PreKubeadmCommands: defaultPreKubeadmCommands(),
@@ -480,10 +481,11 @@ func ignitionKubeadmInitSpec(files []bootstrapv1.File) bootstrapv1.KubeadmConfig
 			NodeRegistration: nro,
 		},
 		ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
-			APIServer: bootstrapv1.APIServer{
-				ControlPlaneComponent: defaultControlPlaneComponent(),
+			ControllerManager: bootstrapv1.ControlPlaneComponent{
+				ExtraArgs: map[string]string{
+					"cloud-provider": "external",
+				},
 			},
-			ControllerManager: defaultControlPlaneComponent(),
 		},
 		Users:              flatcarUsers(),
 		PreKubeadmCommands: flatcarPreKubeadmCommands(),
@@ -555,9 +557,11 @@ func newIgnitionKubeadmConfigTemplate() bootstrapv1.KubeadmConfigTemplate {
 
 func defaultNodeRegistrationOptions() bootstrapv1.NodeRegistrationOptions {
 	return bootstrapv1.NodeRegistrationOptions{
-		Name:             "{{ local_hostname }}",
-		CRISocket:        "/var/run/containerd/containerd.sock",
-		KubeletExtraArgs: defaultExtraArgs(),
+		Name:      "{{ local_hostname }}",
+		CRISocket: "/var/run/containerd/containerd.sock",
+		KubeletExtraArgs: map[string]string{
+			"cloud-provider": "external",
+		},
 	}
 }
 
@@ -585,22 +589,10 @@ func flatcarUsers() []bootstrapv1.User {
 	}
 }
 
-func defaultControlPlaneComponent() bootstrapv1.ControlPlaneComponent {
-	return bootstrapv1.ControlPlaneComponent{
-		ExtraArgs: defaultExtraArgs(),
-	}
-}
-
 func defaultCustomVMXKeys() map[string]string {
 	return map[string]string{}
 }
 
-func defaultExtraArgs() map[string]string {
-	return map[string]string{
-		"cloud-provider": "external",
-	}
-}
-
 func defaultPreKubeadmCommands() []string {
 	return []string{
 		"hostnamectl set-hostname \"{{ ds.meta_data.hostname }}\"",

templates/cluster-template-external-loadbalancer.yaml

@@ -96,9 +96,6 @@ metadata:
 spec:
   kubeadmConfigSpec:
     clusterConfiguration:
-      apiServer:
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external

templates/cluster-template-ignition.yaml

@@ -69,9 +69,6 @@ metadata:
 spec:
   kubeadmConfigSpec:
     clusterConfiguration:
-      apiServer:
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external

templates/cluster-template-node-ipam.yaml

@@ -106,9 +106,6 @@ metadata:
 spec:
   kubeadmConfigSpec:
     clusterConfiguration:
-      apiServer:
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external

templates/cluster-template-supervisor.yaml

@@ -63,9 +63,6 @@ metadata:
 spec:
   kubeadmConfigSpec:
     clusterConfiguration:
-      apiServer:
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external

templates/cluster-template.yaml

@@ -96,9 +96,6 @@ metadata:
 spec:
   kubeadmConfigSpec:
     clusterConfiguration:
-      apiServer:
-        extraArgs:
-          cloud-provider: external
       controllerManager:
         extraArgs:
           cloud-provider: external

templates/clusterclass-template-supervisor.yaml

@@ -264,9 +264,6 @@ spec:
     spec:
       kubeadmConfigSpec:
         clusterConfiguration:
-          apiServer:
-            extraArgs:
-              cloud-provider: external
           controllerManager:
             extraArgs:
               cloud-provider: external

templates/clusterclass-template.yaml

@@ -324,9 +324,6 @@ spec:
     spec:
       kubeadmConfigSpec:
         clusterConfiguration:
-          apiServer:
-            extraArgs:
-              cloud-provider: external
           controllerManager:
             extraArgs:
               cloud-provider: external