Merge pull request #40277 from liggitt/builtin-nil-check

Automatic merge from submit-queue (batch tested with PRs 40196, 40143, 40277) avoid incorrect short-circuit of client-ca setup PasswordFile options should only affect computation of the SupportsBasicAuth field, not short-circuit setting up the client ca certpool

Merge pull request #40277 from liggitt/builtin-nil-check
23694f99 · Kubernetes Submit Queue · GitHub · 71c918d9 · c6c0b851 · 23694f99
Commit 23694f99 authored Jan 23, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

authentication.go pkg/kubeapiserver/options/authentication.go +3 -2

No files found.
--- a/pkg/kubeapiserver/options/authentication.go
+++ b/pkg/kubeapiserver/options/authentication.go
@@ -298,7 +298,7 @@ func (s *BuiltInAuthenticationOptions) ToAuthenticationConfig() authenticator.Au
 }

 func (o *BuiltInAuthenticationOptions) Apply(c *genericapiserver.Config) error {
-	if o == nil || o.PasswordFile == nil {
+	if o == nil {
 		return nil
 	}

@@ -316,7 +316,8 @@ func (o *BuiltInAuthenticationOptions) Apply(c *genericapiserver.Config) error {
 		}
 	}

-	c.SupportsBasicAuth = len(o.PasswordFile.BasicAuthFile) > 0
+	c.SupportsBasicAuth = o.PasswordFile != nil && len(o.PasswordFile.BasicAuthFile) > 0
+
 	return nil
 }