From a7bd9d6f5f52ddbfa54ea31ba59612fd3bf007d0 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Mon, 2 Apr 2018 14:10:08 -0400 Subject: [PATCH] Revert to using the upstream default of 1y for signing We plan on using long durations for when auto-approve is off and short durations (<1d) for when they are on. A month was too far from either extreme. --- pkg/cmd/server/start/start_kube_controller_manager.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/cmd/server/start/start_kube_controller_manager.go b/pkg/cmd/server/start/start_kube_controller_manager.go index 673b24e25f07..fd7a9039c832 100644 --- a/pkg/cmd/server/start/start_kube_controller_manager.go +++ b/pkg/cmd/server/start/start_kube_controller_manager.go @@ -63,9 +63,6 @@ func computeKubeControllerManagerArgs(kubeconfigFile, saPrivateKeyFile, saRootCA if _, ok := cmdLineArgs["cluster-signing-key-file"]; !ok { cmdLineArgs["cluster-signing-key-file"] = []string{""} } - if _, ok := cmdLineArgs["experimental-cluster-signing-duration"]; !ok { - cmdLineArgs["experimental-cluster-signing-duration"] = []string{"720h"} - } if _, ok := cmdLineArgs["leader-elect-retry-period"]; !ok { cmdLineArgs["leader-elect-retry-period"] = []string{"3s"} }