Merge pull request #54112 from jianglingxia/jlx-kubelet

Automatic merge from submit-queue (batch tested with PRs 54112, 54150, 53816, 54321, 54338). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. correct the kubeDeps.Cloud instead of kcfg.Cloud **What this PR does / why we need it**: default to hostname if kubeDeps.Cloud == nil not kcfg.Cloud **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #54112 from jianglingxia/jlx-kubelet
b3205553 · Kubernetes Submit Queue · GitHub · 7914aed8 · bf04a1c8 · b3205553
Commit b3205553 authored Oct 26, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

server.go cmd/kubelet/app/server.go +1 -1

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -653,7 +653,7 @@ func addChaosToClientConfig(s *options.KubeletServer, config *restclient.Config)
 // Eventually, #2 will be replaced with instances of #3
 func RunKubelet(kubeFlags *options.KubeletFlags, kubeCfg *kubeletconfiginternal.KubeletConfiguration, kubeDeps *kubelet.Dependencies, runOnce bool) error {
 	hostname := nodeutil.GetHostname(kubeFlags.HostnameOverride)
-	// Query the cloud provider for our node name, default to hostname if kcfg.Cloud == nil
+	// Query the cloud provider for our node name, default to hostname if kubeDeps.Cloud == nil
 	nodeName, err := getNodeName(kubeDeps.Cloud, hostname)
 	if err != nil {
 		return err