Merge pull request #17415 from liggitt/master

Automatic merge from submit-queue (batch tested with PRs 17396, 17415). Enable cert rotation for node bootstrap Fixes #17413
openshift · Nov 22, 2017 · 6270675 · 6270675
2 parents 63979f9 + bb5eca1
commit 6270675
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/cmd/server/start/bootstrap_node.go b/pkg/cmd/server/start/bootstrap_node.go
@@ -155,6 +155,7 @@ func overrideNodeConfigForBootstrap(nodeConfig *configapi.NodeConfig, bootstrapK
 	nodeConfig.ServingInfo.ServerCert.CertFile = ""
 	nodeConfig.ServingInfo.ServerCert.KeyFile = ""
 	nodeConfig.KubeletArguments["bootstrap-kubeconfig"] = []string{bootstrapKubeconfig}
+	nodeConfig.KubeletArguments["rotate-certificates"] = []string{"true"}
 
 	// Default a valid certificate directory to store bootstrap certs
 	if _, ok := nodeConfig.KubeletArguments["cert-dir"]; !ok {