Merge pull request #47640 from xiangpengzhao/fix-bin-ver

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add version info to kube-scheduler, kube-proxy and kubelet logs.

**What this PR does / why we need it**:
#46047 add such info to apiserver and CM. This adds version info to other binaries.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: related to #46047 

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-28 20:02:59 -07:00 committed by GitHub
commit 1cd6a50809
5 changed files with 13 additions and 2 deletions

View File

@ -44,6 +44,7 @@ go_library(
"//pkg/util/pointer:go_default_library", "//pkg/util/pointer:go_default_library",
"//pkg/util/resourcecontainer:go_default_library", "//pkg/util/resourcecontainer:go_default_library",
"//pkg/util/sysctl:go_default_library", "//pkg/util/sysctl:go_default_library",
"//pkg/version:go_default_library",
"//pkg/version/verflag:go_default_library", "//pkg/version/verflag:go_default_library",
"//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library", "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",

View File

@ -65,6 +65,7 @@ import (
"k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/oom"
utilpointer "k8s.io/kubernetes/pkg/util/pointer" utilpointer "k8s.io/kubernetes/pkg/util/pointer"
"k8s.io/kubernetes/pkg/util/resourcecontainer" "k8s.io/kubernetes/pkg/util/resourcecontainer"
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/pkg/version/verflag" "k8s.io/kubernetes/pkg/version/verflag"
"k8s.io/utils/exec" "k8s.io/utils/exec"
@ -421,6 +422,8 @@ func createClients(config componentconfig.ClientConnectionConfiguration, masterO
// Run runs the specified ProxyServer. This should never exit (unless CleanupAndExit is set). // Run runs the specified ProxyServer. This should never exit (unless CleanupAndExit is set).
func (s *ProxyServer) Run() error { func (s *ProxyServer) Run() error {
// To help debugging, immediately log version
glog.Infof("Version: %+v", version.Get())
// remove iptables rules and exit // remove iptables rules and exit
if s.CleanupAndExit { if s.CleanupAndExit {
encounteredError := userspace.CleanupLeftovers(s.IptInterface) encounteredError := userspace.CleanupLeftovers(s.IptInterface)

View File

@ -176,6 +176,8 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err
// Otherwise, the caller is assumed to have set up the Dependencies object and a default one will // Otherwise, the caller is assumed to have set up the Dependencies object and a default one will
// not be generated. // not be generated.
func Run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) error { func Run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) error {
// To help debugging, immediately log version
glog.Infof("Version: %+v", version.Get())
if err := run(s, kubeDeps); err != nil { if err := run(s, kubeDeps); err != nil {
return fmt.Errorf("failed to run Kubelet: %v", err) return fmt.Errorf("failed to run Kubelet: %v", err)
} }
@ -712,10 +714,10 @@ func RunKubelet(kubeFlags *options.KubeletFlags, kubeCfg *kubeletconfiginternal.
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.Infof("Started kubelet %s as runonce", version.Get().String()) glog.Infof("Started kubelet as runonce")
} else { } else {
startKubelet(k, podCfg, kubeCfg, kubeDeps) startKubelet(k, podCfg, kubeCfg, kubeDeps)
glog.Infof("Started kubelet %s", version.Get().String()) glog.Infof("Started kubelet")
} }
return nil return nil
} }

View File

@ -17,6 +17,7 @@ go_library(
"//pkg/controller:go_default_library", "//pkg/controller:go_default_library",
"//pkg/features:go_default_library", "//pkg/features:go_default_library",
"//pkg/util/configz:go_default_library", "//pkg/util/configz:go_default_library",
"//pkg/version:go_default_library",
"//plugin/cmd/kube-scheduler/app/options:go_default_library", "//plugin/cmd/kube-scheduler/app/options:go_default_library",
"//plugin/pkg/scheduler:go_default_library", "//plugin/pkg/scheduler:go_default_library",
"//plugin/pkg/scheduler/algorithmprovider:go_default_library", "//plugin/pkg/scheduler/algorithmprovider:go_default_library",

View File

@ -34,6 +34,7 @@ import (
"k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options" "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options"
_ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider"
"k8s.io/kubernetes/plugin/pkg/scheduler/factory" "k8s.io/kubernetes/plugin/pkg/scheduler/factory"
@ -66,6 +67,9 @@ through the API as necessary.`,
// Run runs the specified SchedulerServer. This should never exit. // Run runs the specified SchedulerServer. This should never exit.
func Run(s *options.SchedulerServer) error { func Run(s *options.SchedulerServer) error {
// To help debugging, immediately log version
glog.Infof("Version: %+v", version.Get())
kubecli, err := createClient(s) kubecli, err := createClient(s)
if err != nil { if err != nil {
return fmt.Errorf("unable to create kube client: %v", err) return fmt.Errorf("unable to create kube client: %v", err)