Merge pull request #37420 from zdj6373/kubelet-log

Automatic merge from submit-queue (batch tested with PRs 37208, 37446, 37420) Kubelet log modification Keep in line with the other error logs in the function. After return, the caller records the error log.Delete redundant logs

Merge pull request #37420 from zdj6373/kubelet-log
be5d1724 · Kubernetes Submit Queue · GitHub · 708b1f3d · c36ca034 · be5d1724
Commit be5d1724 authored Dec 05, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

kubelet.go pkg/kubelet/kubelet.go +1 -2

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1183,8 +1183,7 @@ func (kl *Kubelet) initializeModules() error {
 	// Step 5: Start container manager.
 	node, err := kl.getNodeAnyWay()
 	if err != nil {
-		glog.Errorf("Cannot get Node info: %v", err)
-		return fmt.Errorf("Kubelet failed to get node info.")
+		return fmt.Errorf("Kubelet failed to get node info: %v", err)
 	}

 	if err := kl.containerManager.Start(node); err != nil {