Remove the logic for creating cloud-config for in-tree CCM

cmd/osm-controller/main.go

@@ -118,7 +118,7 @@ func main() {
 	flag.IntVar(&opt.workerCount, "worker-count", 10, "Number of workers which process reconciliation in parallel.")
 	flag.StringVar(&opt.namespace, "namespace", "", "The namespace where the OSC controller will run.")
 	flag.StringVar(&opt.containerRuntime, "container-runtime", "containerd", "container runtime to deploy.")
-	flag.BoolVar(&opt.externalCloudProvider, "external-cloud-provider", false, "cloud-provider Kubelet flag set to external.")
+	flag.BoolVar(&opt.externalCloudProvider, "external-cloud-provider", false, "(deprecated) cloud-provider Kubelet flag set to external.")
 	flag.StringVar(&opt.clusterDNSIPs, "cluster-dns", "10.10.10.10", "Comma-separated list of DNS server IP address.")
 	flag.StringVar(&opt.pauseImage, "pause-image", "", "pause image to use in Kubelet.")
 	flag.StringVar(&opt.initialTaints, "initial-taints", "", "taints to use when creating the node.")
@@ -311,7 +311,6 @@ func main() {
 		parsedClusterDNSIPs,
 		generator.NewDefaultCloudConfigGenerator(""),
 		opt.containerRuntime,
-		opt.externalCloudProvider,
 		opt.pauseImage,
 		opt.initialTaints,
 		opt.nodeHTTPProxy,

deploy/osps/default/osp-amzn2.yaml

@@ -553,13 +553,7 @@ spec:
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
                 --cert-dir=/etc/kubernetes/pki \
-                {{- if .ExternalCloudProvider }}
                 --cloud-provider=external \
-                {{- /* In-tree cloud providers have been disabled starting from k8s 1.29. For more information: https://github.com/kubernetes/kubernetes/pull/117503 */}}
-                {{- else if and (.InTreeCCMAvailable) (semverCompare "<1.29" .KubeVersion) }}
-                --cloud-provider={{- .CloudProviderName }} \
-                --cloud-config=/etc/kubernetes/cloud-config \
-                {{- end }}
                 {{- if ne .CloudProviderName "aws" }}
                 --hostname-override=${KUBELET_HOSTNAME} \
                 {{- else if and (eq .CloudProviderName "aws") (.ExternalCloudProvider) }}
@@ -576,22 +570,14 @@ spec:
                 {{- if eq .ContainerRuntime "containerd" }}
                 --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
                 {{- end }}
-                {{- /* If external or in-tree CCM is in use we don't need to set --node-ip as the cloud provider will know what IPs to return.  */}}
-                {{- if not (and (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) (or (.InTreeCCMAvailable) (.ExternalCloudProvider))) }}
+                {{- /* Set the node IP unless the network family is dual-stack. */}}
+                {{- if not (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) }}
                 --node-ip ${KUBELET_NODE_IP}
                 {{- end }}
 
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/kubernetes/cloud-config
-        permissions: 600
-        content:
-          inline:
-            encoding: b64
-            data: |
-              {{ .CloudConfig }}
-
       - path: /opt/bin/setup_net_env.sh
         permissions: 755
         content:

deploy/osps/default/osp-flatcar-cloud-init.yaml

@@ -577,13 +577,7 @@ spec:
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
                 --cert-dir=/etc/kubernetes/pki \
-                {{- if .ExternalCloudProvider }}
                 --cloud-provider=external \
-                {{- /* In-tree cloud providers have been disabled starting from k8s 1.29. For more information: https://github.com/kubernetes/kubernetes/pull/117503 */}}
-                {{- else if and (.InTreeCCMAvailable) (semverCompare "<1.29" .KubeVersion) }}
-                --cloud-provider={{- .CloudProviderName }} \
-                --cloud-config=/etc/kubernetes/cloud-config \
-                {{- end }}
                 {{- if ne .CloudProviderName "aws" }}
                 --hostname-override=${KUBELET_HOSTNAME} \
                 {{- else if and (eq .CloudProviderName "aws") (.ExternalCloudProvider) }}
@@ -600,8 +594,8 @@ spec:
                 {{- if eq .ContainerRuntime "containerd" }}
                 --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
                 {{- end }}
-                {{- /* If external or in-tree CCM is in use we don't need to set --node-ip as the cloud provider will know what IPs to return.  */}}
-                {{- if not (and (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) (or (.InTreeCCMAvailable) (.ExternalCloudProvider))) }}
+                {{- /* Set the node IP unless the network family is dual-stack. */}}
+                {{- if not (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) }}
                 --node-ip ${KUBELET_NODE_IP}
                 {{- end }}
 
@@ -625,14 +619,6 @@ spec:
               [Service]
               ExecStartPre=/opt/bin/setup_kernel_for_kubelet.sh
 
-      - path: /etc/kubernetes/cloud-config
-        permissions: 600
-        content:
-          inline:
-            encoding: b64
-            data: |
-              {{ .CloudConfig }}
-
       - path: /etc/kubernetes/kubelet.conf
         content:
           inline:

deploy/osps/default/osp-flatcar.yaml

@@ -709,13 +709,7 @@ spec:
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
                 --cert-dir=/etc/kubernetes/pki \
-                {{- if .ExternalCloudProvider }}
                 --cloud-provider=external \
-                {{- /* In-tree cloud providers have been disabled starting from k8s 1.29. For more information: https://github.com/kubernetes/kubernetes/pull/117503 */}}
-                {{- else if and (.InTreeCCMAvailable) (semverCompare "<1.29" .KubeVersion) }}
-                --cloud-provider={{- .CloudProviderName }} \
-                --cloud-config=/etc/kubernetes/cloud-config \
-                {{- end }}
                 {{- if ne .CloudProviderName "aws" }}
                 --hostname-override=${KUBELET_HOSTNAME} \
                 {{- else if and (eq .CloudProviderName "aws") (.ExternalCloudProvider) }}
@@ -732,22 +726,14 @@ spec:
                 {{- if eq .ContainerRuntime "containerd" }}
                 --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
                 {{- end }}
-                {{- /* If external or in-tree CCM is in use we don't need to set --node-ip as the cloud provider will know what IPs to return.  */}}
-                {{- if not (and (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) (or (.InTreeCCMAvailable) (.ExternalCloudProvider))) }}
+                {{- /* Set the node IP unless the network family is dual-stack. */}}
+                {{- if not (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) }}
                 --node-ip ${KUBELET_NODE_IP}
                 {{- end }}
 
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/kubernetes/cloud-config
-        permissions: 600
-        content:
-          inline:
-            encoding: b64
-            data: |
-              {{ .CloudConfig }}
-
       - path: /etc/kubernetes/kubelet.conf
         content:
           inline:

deploy/osps/default/osp-rhel.yaml

@@ -591,9 +591,7 @@ spec:
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
                 --cert-dir=/etc/kubernetes/pki \
-                {{- if .ExternalCloudProvider }}
                 --cloud-provider=external \
-                {{- end }}
                 {{- if ne .CloudProviderName "aws" }}
                 --hostname-override=${KUBELET_HOSTNAME} \
                 {{- else if and (eq .CloudProviderName "aws") (.ExternalCloudProvider) }}
@@ -610,22 +608,14 @@ spec:
                 {{- if eq .ContainerRuntime "containerd" }}
                 --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
                 {{- end }}
-                {{- /* If external or in-tree CCM is in use we don't need to set --node-ip as the cloud provider will know what IPs to return.  */}}
-                {{- if not (and (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) (or (.InTreeCCMAvailable) (.ExternalCloudProvider))) }}
+                {{- /* Set the node IP unless the network family is dual-stack. */}}
+                {{- if not (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) }}
                 --node-ip ${KUBELET_NODE_IP}
                 {{- end }}
 
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/kubernetes/cloud-config
-        permissions: 600
-        content:
-          inline:
-            encoding: b64
-            data: |
-              {{ .CloudConfig }}
-
       - path: /opt/bin/setup_net_env.sh
         permissions: 755
         content:

deploy/osps/default/osp-rockylinux.yaml

@@ -595,13 +595,7 @@ spec:
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
                 --cert-dir=/etc/kubernetes/pki \
-                {{- if .ExternalCloudProvider }}
                 --cloud-provider=external \
-                {{- /* In-tree cloud providers have been disabled starting from k8s 1.29. For more information: https://github.com/kubernetes/kubernetes/pull/117503 */}}
-                {{- else if and (.InTreeCCMAvailable) (semverCompare "<1.29" .KubeVersion) }}
-                --cloud-provider={{- .CloudProviderName }} \
-                --cloud-config=/etc/kubernetes/cloud-config \
-                {{- end }}
                 {{- if ne .CloudProviderName "aws" }}
                 --hostname-override=${KUBELET_HOSTNAME} \
                 {{- else if and (eq .CloudProviderName "aws") (.ExternalCloudProvider) }}
@@ -618,22 +612,14 @@ spec:
                 {{- if eq .ContainerRuntime "containerd" }}
                 --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
                 {{- end }}
-                {{- /* If external or in-tree CCM is in use we don't need to set --node-ip as the cloud provider will know what IPs to return.  */}}
-                {{- if not (and (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) (or (.InTreeCCMAvailable) (.ExternalCloudProvider))) }}
+                {{- /* Set the node IP unless the network family is dual-stack. */}}
+                {{- if not (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) }}
                 --node-ip ${KUBELET_NODE_IP}
                 {{- end }}
 
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/kubernetes/cloud-config
-        permissions: 600
-        content:
-          inline:
-            encoding: b64
-            data: |
-              {{ .CloudConfig }}
-
       - path: /opt/bin/setup_net_env.sh
         permissions: 755
         content:

deploy/osps/default/osp-ubuntu.yaml

@@ -619,13 +619,7 @@ spec:
                 --kubeconfig=/var/lib/kubelet/kubeconfig \
                 --config=/etc/kubernetes/kubelet.conf \
                 --cert-dir=/etc/kubernetes/pki \
-                {{- if .ExternalCloudProvider }}
                 --cloud-provider=external \
-                {{- /* In-tree cloud providers have been disabled starting from k8s 1.29. For more information: https://github.com/kubernetes/kubernetes/pull/117503 */}}
-                {{- else if and (.InTreeCCMAvailable) (semverCompare "<1.29" .KubeVersion) }}
-                --cloud-provider={{- .CloudProviderName }} \
-                --cloud-config=/etc/kubernetes/cloud-config \
-                {{- end }}
                 {{- if ne .CloudProviderName "aws" }}
                 --hostname-override=${KUBELET_HOSTNAME} \
                 {{- else if and (eq .CloudProviderName "aws") (.ExternalCloudProvider) }}
@@ -642,22 +636,14 @@ spec:
                 {{- if eq .ContainerRuntime "containerd" }}
                 --container-runtime-endpoint=unix:///run/containerd/containerd.sock \
                 {{- end }}
-                {{- /* If external or in-tree CCM is in use we don't need to set --node-ip as the cloud provider will know what IPs to return.  */}}
-                {{- if not (and (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) (or (.InTreeCCMAvailable) (.ExternalCloudProvider))) }}
+                {{- /* Set the node IP unless the network family is dual-stack. */}}
+                {{- if not (or (eq .NetworkIPFamily "IPv4+IPv6") (eq .NetworkIPFamily "IPv6+IPv4")) }}
                 --node-ip ${KUBELET_NODE_IP}
                 {{- end }}
 
               [Install]
               WantedBy=multi-user.target
 
-      - path: /etc/kubernetes/cloud-config
-        permissions: 600
-        content:
-          inline:
-            encoding: b64
-            data: |
-              {{ .CloudConfig }}
-
       - path: /opt/bin/setup_net_env.sh
         permissions: 755
         content: