From f7387173d92bd02104ef25a1c98735003fa7b3f0 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Wed, 6 Nov 2024 21:26:17 +0000
Subject: [PATCH] Remove special hostname behavior for aws cloud-provider

The in-tree aws cloud provider has been removed and the kubelet will fail to start if the cloud-provider-name is set to aws, so this is dead code.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 89a8d81227fe12fb8ca7f4aecff22ac6834e0643)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
 pkg/rke2/rke2_linux.go | 64 ------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/pkg/rke2/rke2_linux.go b/pkg/rke2/rke2_linux.go
index 3bf5c9e3c9..f0902668c4 100644
--- a/pkg/rke2/rke2_linux.go
+++ b/pkg/rke2/rke2_linux.go
@@ -4,16 +4,10 @@
 package rke2
 
 import (
-	"bytes"
-	"context"
 	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/k3s-io/k3s/pkg/agent/config"
 	"github.com/k3s-io/k3s/pkg/cli/cmds"
@@ -24,7 +18,6 @@ import (
 	"github.com/rancher/rke2/pkg/cli/defaults"
 	"github.com/rancher/rke2/pkg/images"
 	"github.com/rancher/rke2/pkg/podexecutor"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
@@ -96,19 +89,6 @@ func initExecutor(clx *cli.Context, cfg Config, isServer bool) (*podexecutor.Sta
 			Name: cfg.CloudProviderName,
 			Path: cfg.CloudProviderConfig,
 		}
-		if clx.String("node-name") == "" && cfg.CloudProviderName == "aws" {
-			fqdn := hostnameFromMetadataEndpoint(context.Background())
-			if fqdn == "" {
-				hostFQDN, err := hostnameFQDN()
-				if err != nil {
-					return nil, err
-				}
-				fqdn = hostFQDN
-			}
-			if err := clx.Set("node-name", fqdn); err != nil {
-				return nil, err
-			}
-		}
 	}
 
 	if cfg.KubeletPath == "" {
@@ -489,47 +469,3 @@ func parseControlPlaneMounts(cfg Config) (*podexecutor.ControlPlaneMounts, error
 		CloudControllerManager: cfg.ExtraMounts.CloudControllerManager.Value(),
 	}, nil
 }
-
-func hostnameFQDN() (string, error) {
-	cmd := exec.Command("hostname", "-f")
-
-	var b bytes.Buffer
-	cmd.Stdout = &b
-
-	if err := cmd.Run(); err != nil {
-		return "", err
-	}
-
-	return strings.TrimSpace(b.String()), nil
-}
-
-func hostnameFromMetadataEndpoint(ctx context.Context) string {
-	ctx, cancel := context.WithTimeout(ctx, time.Second)
-	defer cancel()
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://169.254.169.254/latest/meta-data/local-hostname", nil)
-	if err != nil {
-		logrus.Debugf("Failed to create request for metadata endpoint: %v", err)
-		return ""
-	}
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		logrus.Debugf("Failed to get local-hostname from metadata endpoint: %v", err)
-		return ""
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		logrus.Debugf("Metadata endpoint returned unacceptable status code %d", resp.StatusCode)
-		return ""
-	}
-
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		logrus.Debugf("Failed to read response body from metadata endpoint: %v", err)
-		return ""
-	}
-
-	return strings.TrimSpace(string(b))
-}