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.
This commit is contained in:
k8s-merge-robot 2016-04-14 00:48:11 -07:00
commit 1965c3cdd0

View File

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