Removed default hostname-override

Signed-off-by: Dmytro Oboznyi <[email protected]>
kubernetes · Jan 16, 2021 · 4a1ec5c · 4a1ec5c
1 parent 75f8adf
commit 4a1ec5c
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go
@@ -130,17 +130,10 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 	klog.V(1).Infof("Cloud Provider: %s", cloudProvider)
 	if cloudProvider == kops.CloudProviderAWS {
 		clusterSpec.Kubelet.CloudProvider = "aws"
-
-		// Use the hostname from the AWS metadata service
-		// if hostnameOverride is not set.
-		if clusterSpec.Kubelet.HostnameOverride == "" {
-			clusterSpec.Kubelet.HostnameOverride = "@aws"
-		}
 	}
 
 	if cloudProvider == kops.CloudProviderDO {
 		clusterSpec.Kubelet.CloudProvider = "external"
-		clusterSpec.Kubelet.HostnameOverride = "@digitalocean"
 	}
 
 	if cloudProvider == kops.CloudProviderGCE {
@@ -152,12 +145,6 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 		}
 		clusterSpec.CloudConfig.Multizone = fi.Bool(true)
 		clusterSpec.CloudConfig.NodeTags = fi.String(GCETagForRole(b.ClusterName, kops.InstanceGroupRoleNode))
-
-		// Use the hostname from the GCE metadata service
-		// if hostnameOverride is not set.
-		if clusterSpec.Kubelet.HostnameOverride == "" {
-			clusterSpec.Kubelet.HostnameOverride = "@gce"
-		}
 	}
 
 	if cloudProvider == kops.CloudProviderOpenstack {
@@ -166,7 +153,6 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 
 	if cloudProvider == kops.CloudProviderALI {
 		clusterSpec.Kubelet.CloudProvider = "alicloud"
-		clusterSpec.Kubelet.HostnameOverride = "@alicloud"
 	}
 
 	if clusterSpec.ExternalCloudControllerManager != nil {