From eb8b278bcd306283bacaaf3afa8cb27a3b25305d Mon Sep 17 00:00:00 2001
From: Kinara Shah <kinara@rancher.com>
Date: Mon, 10 Jan 2022 09:34:33 -0800
Subject: [PATCH] delete hostname-override for aws cloud provider

aws cloud provider assigns private dns as the node name,
don't override it since it cannot be changed.
---
 cluster/plan.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cluster/plan.go b/cluster/plan.go
index 81195b84..aa352a96 100644
--- a/cluster/plan.go
+++ b/cluster/plan.go
@@ -472,7 +472,11 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
 		if host.IsWindows() { // compatible with Windows
 			CommandArgs["cloud-config"] = path.Join(host.PrefixPath, cloudConfigFileName)
 		}
+		if c.CloudProvider.Name == k8s.AWSCloudProvider {
+			delete(CommandArgs, "hostname-override")
+		}
 	}
+
 	if c.IsKubeletGenerateServingCertificateEnabled() {
 		CommandArgs["tls-cert-file"] = pki.GetCertPath(pki.GetCrtNameForHost(host, pki.KubeletCertName))
 		CommandArgs["tls-private-key-file"] = pki.GetCertPath(fmt.Sprintf("%s-key", pki.GetCrtNameForHost(host, pki.KubeletCertName)))
@@ -649,6 +653,9 @@ func (c *Cluster) BuildKubeProxyProcess(host *hosts.Host, serviceOptions v3.Kube
 		} else {
 			CommandArgs["bind-address"] = host.Address
 		}
+		if c.CloudProvider.Name == k8s.AWSCloudProvider {
+			delete(CommandArgs, "hostname-override")
+		}
 	}
 
 	// Best security practice is to listen on localhost, but DinD uses private container network instead of Host.