Differentiate CloudProviderName and KubeletCloudProviderName

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
kubermatic · Jan 13, 2022 · 7e9a3df · 7e9a3df
1 parent 1747405
commit 7e9a3df
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/pkg/apis/plugin/plugin.go b/pkg/apis/plugin/plugin.go
@@ -41,20 +41,21 @@ const (
 
 // UserDataRequest requests user data with the given arguments.
 type UserDataRequest struct {
-	MachineSpec           clusterv1alpha1.MachineSpec
-	Kubeconfig            *clientcmdapi.Config
-	CloudProviderName     string
-	CloudConfig           string
-	DNSIPs                []net.IP
-	ExternalCloudProvider bool
-	HTTPProxy             string
-	NoProxy               string
-	PauseImage            string
-	KubeletFeatureGates   map[string]bool
-	KubeletConfigs        map[string]string
-	ContainerRuntime      containerruntime.Config
-	PodCIDR               string
-	NodePortRange         string
+	MachineSpec              clusterv1alpha1.MachineSpec
+	Kubeconfig               *clientcmdapi.Config
+	CloudProviderName        string
+	CloudConfig              string
+	DNSIPs                   []net.IP
+	ExternalCloudProvider    bool
+	HTTPProxy                string
+	NoProxy                  string
+	PauseImage               string
+	KubeletCloudProviderName string
+	KubeletFeatureGates      map[string]bool
+	KubeletConfigs           map[string]string
+	ContainerRuntime         containerruntime.Config
+	PodCIDR                  string
+	NodePortRange            string
 }
 
 // UserDataResponse contains the responded user data.

diff --git a/pkg/controller/machine/machine_controller.go b/pkg/controller/machine/machine_controller.go
@@ -702,7 +702,7 @@ func (r *Reconciler) ensureInstanceExistsForMachine(
 				return nil, fmt.Errorf("failed to create bootstrap kubeconfig: %v", err)
 			}
 
-			cloudConfig, cloudProviderName, err := prov.GetCloudConfig(machine.Spec)
+			cloudConfig, kubeletCloudProviderName, err := prov.GetCloudConfig(machine.Spec)
 			if err != nil {
 				return nil, fmt.Errorf("failed to render cloud config: %v", err)
 			}
@@ -746,20 +746,21 @@ func (r *Reconciler) ensureInstanceExistsForMachine(
 			crRuntime.RegistryCredentials = registryCredentials
 
 			req := plugin.UserDataRequest{
-				MachineSpec:           machine.Spec,
-				Kubeconfig:            kubeconfig,
-				CloudConfig:           cloudConfig,
-				CloudProviderName:     cloudProviderName,
-				ExternalCloudProvider: externalCloudProvider,
-				DNSIPs:                r.nodeSettings.ClusterDNSIPs,
-				PauseImage:            r.nodeSettings.PauseImage,
-				KubeletFeatureGates:   kubeletFeatureGates,
-				KubeletConfigs:        KubeletConfigs,
-				NoProxy:               r.nodeSettings.NoProxy,
-				HTTPProxy:             r.nodeSettings.HTTPProxy,
-				ContainerRuntime:      crRuntime,
-				PodCIDR:               r.podCIDR,
-				NodePortRange:         r.nodePortRange,
+				MachineSpec:              machine.Spec,
+				Kubeconfig:               kubeconfig,
+				CloudConfig:              cloudConfig,
+				CloudProviderName:        string(providerConfig.CloudProvider),
+				ExternalCloudProvider:    externalCloudProvider,
+				DNSIPs:                   r.nodeSettings.ClusterDNSIPs,
+				PauseImage:               r.nodeSettings.PauseImage,
+				KubeletCloudProviderName: kubeletCloudProviderName,
+				KubeletFeatureGates:      kubeletFeatureGates,
+				KubeletConfigs:           KubeletConfigs,
+				NoProxy:                  r.nodeSettings.NoProxy,
+				HTTPProxy:                r.nodeSettings.HTTPProxy,
+				ContainerRuntime:         crRuntime,
+				PodCIDR:                  r.podCIDR,
+				NodePortRange:            r.nodePortRange,
 			}
 
 			// Here we do stuff!