[v1.4] Forward port changes around hostname-override

cluster/defaults.go

@@ -163,6 +163,7 @@ var (
 	}
 	DefaultClusterProportionalAutoscalerLinearParams = v3.LinearAutoscalerParams{CoresPerReplica: 128, NodesPerReplica: 4, Min: 1, PreventSinglePointFailure: true}
 	DefaultMonitoringAddonReplicas                   = int32(1)
+	defaultUseInstanceMetadataHostname               = false
 )
 
 type ExternalFlags struct {
@@ -269,6 +270,10 @@ func (c *Cluster) setClusterDefaults(ctx context.Context, flags ExternalFlags) e
 		c.ForceDeployCerts = true
 	}
 
+	if c.CloudProvider.Name == k8s.AWSCloudProvider && c.CloudProvider.UseInstanceMetadataHostname == nil {
+		c.CloudProvider.UseInstanceMetadataHostname = &defaultUseInstanceMetadataHostname
+	}
+
 	// enable cri-dockerd for k8s >= 1.24
 	err = c.setCRIDockerd()
 	if err != nil {

cluster/plan.go

@@ -462,11 +462,12 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host, serviceOptions v3.Kubern
 	kubelet := &c.Services.Kubelet
 	Command := c.getRKEToolsEntryPoint(host.OS(), "kubelet")
 	CommandArgs := map[string]string{
-		"client-ca-file":            pki.GetCertPath(pki.CACertName),
-		"cloud-provider":            c.CloudProvider.Name,
-		"cluster-dns":               c.ClusterDNSServer,
-		"cluster-domain":            c.ClusterDomain,
-		"fail-swap-on":              strconv.FormatBool(kubelet.FailSwapOn),
+		"client-ca-file": pki.GetCertPath(pki.CACertName),
+		"cloud-provider": c.CloudProvider.Name,
+		"cluster-dns":    c.ClusterDNSServer,
+		"cluster-domain": c.ClusterDomain,
+		"fail-swap-on":   strconv.FormatBool(kubelet.FailSwapOn),
+		// overrides kubernetes.io/hostname label on node, rke uses it to find node (services/node_util.go)
 		"hostname-override":         host.HostnameOverride,
 		"kubeconfig":                pki.GetConfigPath(pki.KubeNodeCertName),
 		"pod-infra-container-image": kubelet.InfraContainerImage,
@@ -494,9 +495,6 @@ 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() {
@@ -694,7 +692,8 @@ func (c *Cluster) BuildKubeProxyProcess(host *hosts.Host, serviceOptions v3.Kube
 		} else {
 			CommandArgs["bind-address"] = host.Address
 		}
-		if c.CloudProvider.Name == k8s.AWSCloudProvider {
+		if c.CloudProvider.Name == k8s.AWSCloudProvider && c.CloudProvider.UseInstanceMetadataHostname != nil && *c.CloudProvider.UseInstanceMetadataHostname {
+			// rke-tools will inject hostname-override from ec2 instance metadata to match with the spec.nodeName set by cloud provider https://github.com/rancher/rke-tools/blob/3eab4f07aa97a8aeeaaef55b1b7bbc82e2a3374a/entrypoint.sh#L17
 			delete(CommandArgs, "hostname-override")
 		}
 	}

data/data.json

@@ -17896,7 +17896,7 @@
       "type": "array"
      }
     },
-    "version": "v1.25.5+k3s1"
+    "version": "v1.25.5+k3s2"
    }
   ]
  },
@@ -25139,7 +25139,7 @@
       "version": "0.1.1100"
      },
      "rancher-vsphere-cpi": {
-      "repo": "rancher-charts",
+      "repo": "rancher-rke2-charts",
       "version": "1.4.001"
      },
      "rancher-vsphere-csi": {
@@ -25386,7 +25386,7 @@
       "version": "0.1.1100"
      },
      "rancher-vsphere-cpi": {
-      "repo": "rancher-charts",
+      "repo": "rancher-rke2-charts",
       "version": "1.4.001"
      },
      "rancher-vsphere-csi": {
@@ -26136,7 +26136,7 @@
       "version": "0.1.1100"
      },
      "rancher-vsphere-cpi": {
-      "repo": "rancher-charts",
+      "repo": "rancher-rke2-charts",
       "version": "1.4.001"
      },
      "rancher-vsphere-csi": {
@@ -26386,7 +26386,7 @@
       "version": "0.1.1100"
      },
      "rancher-vsphere-cpi": {
-      "repo": "rancher-charts",
+      "repo": "rancher-rke2-charts",
       "version": "1.4.100"
      },
      "rancher-vsphere-csi": {
@@ -26636,7 +26636,7 @@
       "version": "0.1.1100"
      },
      "rancher-vsphere-cpi": {
-      "repo": "rancher-charts",
+      "repo": "rancher-rke2-charts",
       "version": "1.4.100"
      },
      "rancher-vsphere-csi": {

types/rke_types.go

@@ -557,6 +557,8 @@ type PortCheck struct {
 type CloudProvider struct {
 	// Name of the Cloud Provider
 	Name string `yaml:"name" json:"name,omitempty"`
+	// Only configured for AWS currently, add for other providers as needed
+	UseInstanceMetadataHostname *bool ` yaml:"useInstanceMetadataHostname,omitempty" json:"useInstanceMetadataHostname,omitempty"`
 	// AWSCloudProvider
 	AWSCloudProvider *AWSCloudProvider `yaml:"awsCloudProvider,omitempty" json:"awsCloudProvider,omitempty"`
 	// AzureCloudProvider