Permalink
Browse files

Merge pull request #55878 from dims/automated-cherry-pick-of-#51034-u…

…pstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #51034

Cherry pick of #51034 on release-1.8.

#51034: fix conditional for warning while starting KCM without secret

```release-note
Fix wrong warning when --service-account-private-key-file is specified.
```
  • Loading branch information...
k8s-merge-robot committed Nov 19, 2017
2 parents 2c44047 + 1e6867d commit 9befc2b8928a9426501d3bf62f72849d5cbcd5a3
Showing with 1 addition and 1 deletion.
  1. +1 −1 cmd/kube-controller-manager/app/controllermanager.go
@@ -132,7 +132,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")

0 comments on commit 9befc2b

Please sign in to comment.