github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37420 from zdj6373/kubelet-log

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-12-05 04:47:44 -08:00 committed by GitHub
commit be5d1724f5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@ -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 {