apiserver: fix potential panic with nil SecureServingOptions

8abdbfcb · Dr. Stefan Schimanski · f0abf15e · 8abdbfcb
Commit 8abdbfcb authored Dec 08, 2016 by Dr. Stefan Schimanski
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

serving.go pkg/genericapiserver/options/serving.go +4 -2

No files found.
--- a/pkg/genericapiserver/options/serving.go
+++ b/pkg/genericapiserver/options/serving.go
@@ -173,9 +173,11 @@ func (s *ServingOptions) AddDeprecatedFlags(fs *pflag.FlagSet) {
 }

 func (s *SecureServingOptions) MaybeDefaultWithSelfSignedCerts(publicAddress string, alternateIPs ...net.IP) error {
+	if s == nil {
+		return nil
+	}
 	keyCert := &s.ServerCert.CertKey
-
-	if s == nil || s.ServingOptions.BindPort == 0 || len(keyCert.CertFile) != 0 || len(keyCert.KeyFile) != 0 {
+	if s.ServingOptions.BindPort == 0 || len(keyCert.CertFile) != 0 || len(keyCert.KeyFile) != 0 {
 		return nil
 	}