From 2e631d811ce75b29004601dfb4e73ca58421ee01 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 19 Aug 2016 13:50:07 -0700 Subject: [PATCH] crypto.go: Rename ShouldGenSelfSignedCerts() to FoundCertOrKey(). Since the function only tests whether the files are on the disk, the original name is a little bit misleading. --- cmd/kubelet/app/server.go | 2 +- pkg/genericapiserver/genericapiserver.go | 2 +- pkg/util/crypto/crypto.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index e63965412c7..deb5f081b39 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -699,7 +699,7 @@ func InitializeTLS(s *options.KubeletServer) (*server.TLSOptions, error) { if s.TLSCertFile == "" && s.TLSPrivateKeyFile == "" { s.TLSCertFile = path.Join(s.CertDirectory, "kubelet.crt") s.TLSPrivateKeyFile = path.Join(s.CertDirectory, "kubelet.key") - if crypto.ShouldGenSelfSignedCerts(s.TLSCertFile, s.TLSPrivateKeyFile) { + if !crypto.FoundCertOrKey(s.TLSCertFile, s.TLSPrivateKeyFile) { if err := crypto.GenerateSelfSignedCert(nodeutil.GetHostname(s.HostnameOverride), s.TLSCertFile, s.TLSPrivateKeyFile, nil, nil); err != nil { return nil, fmt.Errorf("unable to generate self signed cert: %v", err) } diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index b6406b4d5a4..ed1c86b2317 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -689,7 +689,7 @@ func (s *GenericAPIServer) Run(options *options.ServerRunOptions) { alternateDNS := []string{"kubernetes.default.svc", "kubernetes.default", "kubernetes"} // It would be nice to set a fqdn subject alt name, but only the kubelets know, the apiserver is clueless // alternateDNS = append(alternateDNS, "kubernetes.default.svc.CLUSTER.DNS.NAME") - if crypto.ShouldGenSelfSignedCerts(options.TLSCertFile, options.TLSPrivateKeyFile) { + if !crypto.FoundCertOrKey(options.TLSCertFile, options.TLSPrivateKeyFile) { if err := crypto.GenerateSelfSignedCert(s.ClusterIP.String(), options.TLSCertFile, options.TLSPrivateKeyFile, alternateIPs, alternateDNS); err != nil { glog.Errorf("Unable to generate self signed cert: %v", err) } else { diff --git a/pkg/util/crypto/crypto.go b/pkg/util/crypto/crypto.go index c32357a1991..32650e4912a 100644 --- a/pkg/util/crypto/crypto.go +++ b/pkg/util/crypto/crypto.go @@ -33,14 +33,14 @@ import ( "time" ) -// ShouldGenSelfSignedCerts returns false if the certificate or key files already exists, -// otherwise returns true. -func ShouldGenSelfSignedCerts(certPath, keyPath string) bool { +// FoundCertOrKey returns true if the certificate or key files already exists, +// otherwise returns false. +func FoundCertOrKey(certPath, keyPath string) bool { if canReadFile(certPath) || canReadFile(keyPath) { - return false + return true } - return true + return false } // If the file represented by path exists and