Merge pull request #51034 from wlan0/master

Automatic merge from submit-queue (batch tested with PRs 51034, 53239). 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>. fix conditional for warning while starting KCM without secret file @liggitt @spiffxp @lavalamp Fixes #53291 A small bug was introduced in this PR - https://github.com/kubernetes/kubernetes/pull/50288, where the warning message is printed when the file is specified, and it is not printed if it is left blank - exactly the opposite of the intended behavior. This fixes that. ``` release-note-none ```

Merge pull request #51034 from wlan0/master
6cc1816c · Kubernetes Submit Queue · GitHub · d2bbeb66 · fb0b57ee · 6cc1816c
Commit 6cc1816c authored Sep 30, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

controllermanager.go cmd/kube-controller-manager/app/controllermanager.go +1 -1

No files found.
--- a/cmd/kube-controller-manager/app/controllermanager.go
+++ b/cmd/kube-controller-manager/app/controllermanager.go
@@ -131,7 +131,7 @@ func Run(s *options.CMServer) error {
 		}
 		var clientBuilder controller.ControllerClientBuilder
 		if s.UseServiceAccountCredentials {
-			if len(s.ServiceAccountKeyFile) > 0 {
+			if len(s.ServiceAccountKeyFile) == 0 {
 				// It's possible another controller process is creating the tokens for us.
 				// If one isn't, we'll timeout and exit when our client builder is unable to create the tokens.
 				glog.Warningf("--use-service-account-credentials was specified without providing a --service-account-private-key-file")