Merge pull request #62766 from mikedanese/alpha4

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. self sign certs when ServerTLSBootstrap is disabled kc.ServerTLSBootstrap can't be true unless the feature gate is enabled. If the feature gate is enabled and kc.ServerTLSBootstrap is false, we should generate self signed certs. Fixes https://github.com/kubernetes/kubernetes/issues/62700 ```release-note NONE ```

Merge pull request #62766 from mikedanese/alpha4
214ce657 · Kubernetes Submit Queue · GitHub · b37564d9 · cca8e1ce · 214ce657
Unverified Commit 214ce657 authored Apr 18, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

server.go cmd/kubelet/app/server.go +1 -1

No files found.
--- a/cmd/kubelet/app/server.go
+++ b/cmd/kubelet/app/server.go
@@ -736,7 +736,7 @@ func getNodeName(cloud cloudprovider.Interface, hostname string) (types.NodeName
 // InitializeTLS checks for a configured TLSCertFile and TLSPrivateKeyFile: if unspecified a new self-signed
 // certificate and key file are generated. Returns a configured server.TLSOptions object.
 func InitializeTLS(kf *options.KubeletFlags, kc *kubeletconfiginternal.KubeletConfiguration) (*server.TLSOptions, error) {
-	if !utilfeature.DefaultFeatureGate.Enabled(features.RotateKubeletServerCertificate) && kc.TLSCertFile == "" && kc.TLSPrivateKeyFile == "" {
+	if !kc.ServerTLSBootstrap && kc.TLSCertFile == "" && kc.TLSPrivateKeyFile == "" {
 		kc.TLSCertFile = path.Join(kf.CertDirectory, "kubelet.crt")
 		kc.TLSPrivateKeyFile = path.Join(kf.CertDirectory, "kubelet.key")