Skip to content

K
k3s
Commit 0ded5b95 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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.
parents 6f546377 3c78acdb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
federation/cmd/federation-controller-manager/app/controllermanager.go
View file @ 0ded5b95
...@@ -36,6 +36,7 @@ import ( ...@@ -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.`, ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment