github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23635 from Clarifai/version

Browse Source 
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
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubelet/app/server.go
View File

@ -69,6 +69,7 @@ import (
"k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
) )
@ -642,10 +643,10 @@ func RunKubelet(kcfg *KubeletConfig) error {
if _, err := k.RunOnce(podCfg.Updates()); err != nil { if _, err := k.RunOnce(podCfg.Updates()); err != nil {
return fmt.Errorf("runonce failed: %v", err) return fmt.Errorf("runonce failed: %v", err)
} }
glog.Info("Started kubelet as runonce") glog.Infof("Started kubelet %s as runonce", version.Get().String())
} else { } else {
startKubelet(k, podCfg, kcfg) startKubelet(k, podCfg, kcfg)
glog.Info("Started kubelet") glog.Infof("Started kubelet %s", version.Get().String())
} }
return nil return nil
} }