apiserver: don't create self-signed certs with disabled secure serving

79853516 · Dr. Stefan Schimanski · 692f9bb7 · 79853516
Commit 79853516 authored Jul 04, 2018 by Dr. Stefan Schimanski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

serving.go staging/src/k8s.io/apiserver/pkg/server/options/serving.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/options/serving.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/serving.go
@@ -236,7 +236,7 @@ func (s *SecureServingOptions) ApplyTo(config **server.SecureServingInfo) error 
 }

 func (s *SecureServingOptions) MaybeDefaultWithSelfSignedCerts(publicAddress string, alternateDNS []string, alternateIPs []net.IP) error {
-	if s == nil {
+	if s == nil || (s.BindPort == 0 && s.Listener == nil) {
 		return nil
 	}
 	keyCert := &s.ServerCert.CertKey