Merge pull request #23635 from Clarifai/version

Automatic merge from submit-queue Add version string to "Kubelet started" log message Not logging versions considered harmful.

Merge pull request #23635 from Clarifai/version
1965c3cd · k8s-merge-robot · df9f71fc · 5b4f5de6 · 1965c3cd
Commit 1965c3cd authored Apr 14, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

server.go cmd/kubelet/app/server.go +3 -2

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -69,6 +69,7 @@ import (
 	"k8s.io/kubernetes/pkg/util/oom"
 	"k8s.io/kubernetes/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/kubernetes/pkg/version"
 	"k8s.io/kubernetes/pkg/volume"
 )

@@ -642,10 +643,10 @@ func RunKubelet(kcfg *KubeletConfig) error {
 		if _, err := k.RunOnce(podCfg.Updates()); err != nil {
 			return fmt.Errorf("runonce failed: %v", err)
 		}
-		glog.Info("Started kubelet as runonce")
+		glog.Infof("Started kubelet %s as runonce", version.Get().String())
 	} else {
 		startKubelet(k, podCfg, kcfg)
-		glog.Info("Started kubelet")
+		glog.Infof("Started kubelet %s", version.Get().String())
 	}
 	return nil
 }