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

Merge pull request #27735 from mml/fed-log-version

Browse Source 
Automatic merge from submit-queue

Log version info at start.

I need more confidence that the version I'm debugging matches the code on my
machine.
This commit is contained in:
k8s-merge-robot 2016-06-20 20:03:26 -07:00 committed by GitHub
commit 0ded5b952f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federation/cmd/federation-controller-manager/app/controllermanager.go
View File

@ -36,6 +36,7 @@ import (
"k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util/configz" "k8s.io/kubernetes/pkg/util/configz"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/version"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
@ -70,6 +71,7 @@ ship with federation today is the cluster controller.`,
// Run runs the CMServer. This should never exit. // Run runs the CMServer. This should never exit.
func Run(s *options.CMServer) error { func Run(s *options.CMServer) error {
glog.Infof("%+v", version.Get())
if c, err := configz.New("componentconfig"); err == nil { if c, err := configz.New("componentconfig"); err == nil {
c.Set(s.ControllerManagerConfiguration) c.Set(s.ControllerManagerConfiguration)
} else { } else {