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

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.

Merge pull request #27735 from mml/fed-log-version
0ded5b95 · k8s-merge-robot · GitHub · 6f546377 · 3c78acdb · 0ded5b95
Commit 0ded5b95 authored Jun 20, 2016 by k8s-merge-robot Committed by GitHub Jun 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

controllermanager.go ...md/federation-controller-manager/app/controllermanager.go +2 -0

No files found.
--- a/federation/cmd/federation-controller-manager/app/controllermanager.go
+++ b/federation/cmd/federation-controller-manager/app/controllermanager.go
@@ -36,6 +36,7 @@ import (
 	"k8s.io/kubernetes/pkg/healthz"
 	"k8s.io/kubernetes/pkg/util/configz"
 	"k8s.io/kubernetes/pkg/util/wait"
+	"k8s.io/kubernetes/pkg/version"

 	"github.com/golang/glog"
 	"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.
 func Run(s *options.CMServer) error {
+	glog.Infof("%+v", version.Get())
 	if c, err := configz.New("componentconfig"); err == nil {
 		c.Set(s.ControllerManagerConfiguration)
 	} else {