diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 35b9c8ffba2..2368bd15299 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -1059,6 +1059,7 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie if err != nil { return err } + hostnameOverridden := len(kubeServer.HostnameOverride) > 0 // Setup event recorder if required. makeEventRecorder(kubeDeps, nodeName) @@ -1077,7 +1078,9 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie kubeDeps, &kubeServer.ContainerRuntimeOptions, kubeServer.ContainerRuntime, - kubeServer.HostnameOverride, + hostname, + hostnameOverridden, + nodeName, kubeServer.NodeIP, kubeServer.ProviderID, kubeServer.CloudProvider, @@ -1149,7 +1152,9 @@ func createAndInitKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, kubeDeps *kubelet.Dependencies, crOptions *config.ContainerRuntimeOptions, containerRuntime string, - hostnameOverride string, + hostname string, + hostnameOverridden bool, + nodeName types.NodeName, nodeIP string, providerID string, cloudProvider string, @@ -1179,7 +1184,9 @@ func createAndInitKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, kubeDeps, crOptions, containerRuntime, - hostnameOverride, + hostname, + hostnameOverridden, + nodeName, nodeIP, providerID, cloudProvider, diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index d4beb6685da..b1adba3b59a 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -17,7 +17,6 @@ limitations under the License. package kubelet import ( - "context" "crypto/tls" "fmt" "math" @@ -113,7 +112,6 @@ import ( "k8s.io/kubernetes/pkg/security/apparmor" sysctlwhitelist "k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl" utilipt "k8s.io/kubernetes/pkg/util/iptables" - nodeutil "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/selinux" "k8s.io/kubernetes/pkg/volume" @@ -374,7 +372,9 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, kubeDeps *Dependencies, crOptions *config.ContainerRuntimeOptions, containerRuntime string, - hostnameOverride string, + hostname string, + hostnameOverridden bool, + nodeName types.NodeName, nodeIP string, providerID string, cloudProvider string, @@ -416,27 +416,6 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, } } - hostname, err := nodeutil.GetHostname(hostnameOverride) - if err != nil { - return nil, err - } - // Query the cloud provider for our node name, default to hostname - nodeName := types.NodeName(hostname) - if kubeDeps.Cloud != nil { - var err error - instances, ok := kubeDeps.Cloud.Instances() - if !ok { - return nil, fmt.Errorf("failed to get instances from cloud provider") - } - - nodeName, err = instances.CurrentNodeName(context.TODO(), hostname) - if err != nil { - return nil, fmt.Errorf("error fetching current instance name from cloud provider: %v", err) - } - - klog.V(2).Infof("cloud provider determined current node name to be %s", nodeName) - } - if kubeDeps.PodConfig == nil { var err error kubeDeps.PodConfig, err = makePodSourceConfig(kubeCfg, kubeDeps, nodeName, bootstrapCheckpointPath) @@ -531,7 +510,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, klet := &Kubelet{ hostname: hostname, - hostnameOverridden: len(hostnameOverride) > 0, + hostnameOverridden: hostnameOverridden, nodeName: nodeName, kubeClient: kubeDeps.KubeClient, heartbeatClient: kubeDeps.HeartbeatClient,