Cloud-config is not required for external cloud providers

pkg/cloudprovider/cloudprovider.go

@@ -18,6 +18,9 @@ package cloudprovider
 
 import (
 	"errors"
+	"fmt"
+
+	"github.com/Masterminds/semver/v3"
 
 	providerconfigtypes "github.com/kubermatic/machine-controller/pkg/providerconfig/types"
 	"k8c.io/operating-system-manager/pkg/cloudprovider/aws"
@@ -30,7 +33,23 @@ import (
 )
 
 // GetCloudConfig will return the cloud-config for machine
-func GetCloudConfig(pconfig providerconfigtypes.Config, kubeletVersion string) (string, error) {
+func GetCloudConfig(external bool, pconfig providerconfigtypes.Config, kubeletVersion string) (string, error) {
+	// cloud-config is not required by the kubelet for external cloud providers.
+	if external {
+		return "", nil
+	}
+
+	// In-tree cloud providers have been disabled starting from k8s 1.29 hence we don't need to generate cloud-config for them.
+	gteKube129Condition, _ := semver.NewConstraint(">= 1.29")
+	kubeSemVer, err := semver.NewVersion(kubeletVersion)
+	if err != nil {
+		return "", fmt.Errorf("failed to parse kubelet version: %w", err)
+	}
+
+	if gteKube129Condition.Check(kubeSemVer) {
+		return "", nil
+	}
+
 	cloudProvider := osmv1alpha1.CloudProvider(pconfig.CloudProvider)
 
 	switch cloudProvider {

pkg/clusterinfo/configmap.go

@@ -94,7 +94,7 @@ func (p *KubeconfigProvider) buildKubeconfigFromEndpoint(ctx context.Context) (*
 		return nil, errors.New("could not parse ip from ")
 	}
 
-	getSecurePort := func(endpointSubset corev1.EndpointSubset) *corev1.EndpointPort {
+	getSecurePort := func(_ corev1.EndpointSubset) *corev1.EndpointPort {
 		for _, p := range subset.Ports {
 			if p.Name == securePortName {
 				return &p

pkg/controllers/osc/resources/operating_system_config.go

@@ -102,16 +102,6 @@ func GenerateOperatingSystemConfig(
 
 	networkIPFamily := providerConfig.Network.GetIPFamily()
 
-	var cloudConfig string
-	if providerConfig.OverwriteCloudConfig != nil {
-		cloudConfig = *providerConfig.OverwriteCloudConfig
-	} else {
-		cloudConfig, err = cloudprovider.GetCloudConfig(providerConfig, md.Spec.Template.Spec.Versions.Kubelet)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch cloud-config: %w", err)
-		}
-	}
-
 	// Ensure that Kubelet version is prefixed by "v"
 	kubeletVersion, err := semver.NewVersion(md.Spec.Template.Spec.Versions.Kubelet)
 	if err != nil {
@@ -172,9 +162,14 @@ func GenerateOperatingSystemConfig(
 		return nil, err
 	}
 
-	if external &&
-		osmv1alpha1.CloudProvider(providerConfig.CloudProvider) == osmv1alpha1.CloudProviderVsphere {
-		cloudConfig = ""
+	var cloudConfig string
+	if providerConfig.OverwriteCloudConfig != nil {
+		cloudConfig = *providerConfig.OverwriteCloudConfig
+	} else {
+		cloudConfig, err = cloudprovider.GetCloudConfig(external, providerConfig, md.Spec.Template.Spec.Versions.Kubelet)
+		if err != nil {
+			return nil, fmt.Errorf("failed to fetch cloud-config: %w", err)
+		}
 	}
 
 	data := filesData{

pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml

@@ -437,11 +437,7 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |+
-            [global]
-            Zone="eu-central-1b"
-            VPC="e-123f"
-            SubnetID="test-subnet"
+          data: |2+
 
           encoding: b64
       path: /etc/kubernetes/cloud-config

pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml

@@ -409,11 +409,7 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |+
-            [global]
-            Zone="eu-central-1b"
-            VPC="e-123f"
-            SubnetID="test-subnet"
+          data: |2+
 
           encoding: b64
       path: /etc/kubernetes/cloud-config

pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml

@@ -451,8 +451,8 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |
-            {"cloud":"AZUREPUBLICCLOUD","tenantId":"","subscriptionId":"","aadClientId":"","aadClientSecret":"","resourceGroup":"","location":"","vnetName":"","subnetName":"","routeTableName":"","securityGroupName":"fake-sg","primaryAvailabilitySetName":"","vnetResourceGroup":"","useInstanceMetadata":true,"loadBalancerSku":""}
+          data: |2+
+
           encoding: b64
       path: /etc/kubernetes/cloud-config
       permissions: 600

pkg/controllers/osc/testdata/osc-rhel-8.x-cloud-init-modules.yaml

@@ -421,11 +421,7 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |+
-            [global]
-            Zone="eu-central-1b"
-            VPC="e-123f"
-            SubnetID="test-subnet"
+          data: |2+
 
           encoding: b64
       path: /etc/kubernetes/cloud-config

pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml

@@ -411,11 +411,7 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |+
-            [global]
-            Zone="eu-central-1b"
-            VPC="e-123f"
-            SubnetID="test-subnet"
+          data: |2+
 
           encoding: b64
       path: /etc/kubernetes/cloud-config

pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml

@@ -407,11 +407,7 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |+
-            [global]
-            Zone="eu-central-1b"
-            VPC="e-123f"
-            SubnetID="test-subnet"
+          data: |2+
 
           encoding: b64
       path: /etc/kubernetes/cloud-config

pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml

@@ -407,11 +407,7 @@ spec:
       permissions: 644
     - content:
         inline:
-          data: |+
-            [global]
-            Zone="eu-central-1b"
-            VPC="e-123f"
-            SubnetID="test-subnet"
+          data: |2+
 
           encoding: b64
       path: /etc/kubernetes/cloud-config

pkg/controllers/osp/osp_controller.go

@@ -166,16 +166,16 @@ func parseYAMLToObject(ospByte []byte) (*v1alpha1.OperatingSystemProfile, error)
 // filterDeploymentPredicate filters out all deployment events except the creation one.
 func filterDeploymentPredicate() predicate.Predicate {
 	return predicate.Funcs{
-		CreateFunc: func(e event.CreateEvent) bool {
+		CreateFunc: func(_ event.CreateEvent) bool {
 			return true
 		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
+		DeleteFunc: func(_ event.DeleteEvent) bool {
 			return false
 		},
-		UpdateFunc: func(e event.UpdateEvent) bool {
+		UpdateFunc: func(_ event.UpdateEvent) bool {
 			return false
 		},
-		GenericFunc: func(e event.GenericEvent) bool {
+		GenericFunc: func(_ event.GenericEvent) bool {
 			return false
 		},
 	}