github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38381 from sttts/sttts-no-certs-for-zero-port

Browse Source 
Automatic merge from submit-queue

apiserver(s): do not create self-signed certs if port is zero
This commit is contained in:
Kubernetes Submit Queue 2016-12-08 07:41:18 -08:00 committed by GitHub
commit 04070cbc08
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/genericapiserver/options/serving.go
View File

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