Skip to content

K
k3s
Commit 63910654 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39902 from mikedanese/bad-log

Automatic merge from submit-queue (batch tested with PRs 39947, 39936, 39902, 39859, 39915) don't lie about starting the controllers in the controller manager We print started even if it didn't start.
parents aef11345 c6da1bc2
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
cmd/kube-controller-manager/app/controllermanager.go
View file @ 63910654
...@@ -385,6 +385,7 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root ...@@ -385,6 +385,7 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
} }
if !started { if !started {
glog.Warningf("Skipping %q", controllerName) glog.Warningf("Skipping %q", controllerName)
continue
} }
glog.Infof("Started %q", controllerName) glog.Infof("Started %q", controllerName)
} }
......
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