github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 13:14:05 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate calculation nodename 、hostname 、hostnameOverridden

Browse Source
This commit is contained in:
wawa0210
2020-04-19 23:52:08 +08:00
parent e95106106b
commit 40da2c521a
2 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kubelet/app/server.go
View File

@@ -1060,6 +1060,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)
@@ -1078,7 +1079,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,
@@ -1150,7 +1153,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,
@@ -1180,7 +1185,9 @@ func createAndInitKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
kubeDeps,
crOptions,
containerRuntime,
hostnameOverride,
hostname,
hostnameOverridden,
nodeName,
nodeIP,
providerID,
cloudProvider,