Skip to content

Commit 1cd6a50

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#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**: kubernetes#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 kubernetes#46047 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
2 parents f16ed16 + af09159 commit 1cd6a50

File tree

5 files changed

+13
-2
lines changed

5 files changed

+13
-2
lines changed

cmd/kube-proxy/app/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ go_library(
4444
"//pkg/util/pointer:go_default_library",
4545
"//pkg/util/resourcecontainer:go_default_library",
4646
"//pkg/util/sysctl:go_default_library",
47+
"//pkg/version:go_default_library",
4748
"//pkg/version/verflag:go_default_library",
4849
"//vendor/github.com/golang/glog:go_default_library",
4950
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",

cmd/kube-proxy/app/server.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ import (
6565
"k8s.io/kubernetes/pkg/util/oom"
6666
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
6767
"k8s.io/kubernetes/pkg/util/resourcecontainer"
68+
"k8s.io/kubernetes/pkg/version"
6869
"k8s.io/kubernetes/pkg/version/verflag"
6970
"k8s.io/utils/exec"
7071

@@ -421,6 +422,8 @@ func createClients(config componentconfig.ClientConnectionConfiguration, masterO
421422

422423
// Run runs the specified ProxyServer. This should never exit (unless CleanupAndExit is set).
423424
func (s *ProxyServer) Run() error {
425+
// To help debugging, immediately log version
426+
glog.Infof("Version: %+v", version.Get())
424427
// remove iptables rules and exit
425428
if s.CleanupAndExit {
426429
encounteredError := userspace.CleanupLeftovers(s.IptInterface)

cmd/kubelet/app/server.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ func UnsecuredDependencies(s *options.KubeletServer) (*kubelet.Dependencies, err
176176
// Otherwise, the caller is assumed to have set up the Dependencies object and a default one will
177177
// not be generated.
178178
func Run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies) error {
179+
// To help debugging, immediately log version
180+
glog.Infof("Version: %+v", version.Get())
179181
if err := run(s, kubeDeps); err != nil {
180182
return fmt.Errorf("failed to run Kubelet: %v", err)
181183
}
@@ -712,10 +714,10 @@ func RunKubelet(kubeFlags *options.KubeletFlags, kubeCfg *kubeletconfiginternal.
712714
if _, err := k.RunOnce(podCfg.Updates()); err != nil {
713715
return fmt.Errorf("runonce failed: %v", err)
714716
}
715-
glog.Infof("Started kubelet %s as runonce", version.Get().String())
717+
glog.Infof("Started kubelet as runonce")
716718
} else {
717719
startKubelet(k, podCfg, kubeCfg, kubeDeps)
718-
glog.Infof("Started kubelet %s", version.Get().String())
720+
glog.Infof("Started kubelet")
719721
}
720722
return nil
721723
}

plugin/cmd/kube-scheduler/app/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ go_library(
1717
"//pkg/controller:go_default_library",
1818
"//pkg/features:go_default_library",
1919
"//pkg/util/configz:go_default_library",
20+
"//pkg/version:go_default_library",
2021
"//plugin/cmd/kube-scheduler/app/options:go_default_library",
2122
"//plugin/pkg/scheduler:go_default_library",
2223
"//plugin/pkg/scheduler/algorithmprovider:go_default_library",

plugin/cmd/kube-scheduler/app/server.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"k8s.io/client-go/tools/leaderelection/resourcelock"
3535
"k8s.io/kubernetes/pkg/controller"
3636
"k8s.io/kubernetes/pkg/util/configz"
37+
"k8s.io/kubernetes/pkg/version"
3738
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options"
3839
_ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider"
3940
"k8s.io/kubernetes/plugin/pkg/scheduler/factory"
@@ -66,6 +67,9 @@ through the API as necessary.`,
6667

6768
// Run runs the specified SchedulerServer. This should never exit.
6869
func Run(s *options.SchedulerServer) error {
70+
// To help debugging, immediately log version
71+
glog.Infof("Version: %+v", version.Get())
72+
6973
kubecli, err := createClient(s)
7074
if err != nil {
7175
return fmt.Errorf("unable to create kube client: %v", err)

0 commit comments

Comments
 (0)