Merge pull request #19190 from smarterclayton/options

openshift-merge-robot · web-flow · commit 668dff6db514 · 2018-04-02T17:03:16.000-07:00
Adjust defaults to better handle self-hosting and bootstrapping
diff --git a/pkg/cmd/server/kubernetes/node/options/options.go b/pkg/cmd/server/kubernetes/node/options/options.go
@@ -70,7 +70,6 @@ func ComputeKubeletFlags(startingArgs map[string][]string, options configapi.Nod
 	setIfUnset(args, "file-check-frequency", fmt.Sprintf("%ds", fileCheckInterval))
 	setIfUnset(args, "pod-infra-container-image", imageTemplate.ExpandOrDie("pod"))
 	setIfUnset(args, "max-pods", "250")
-	setIfUnset(args, "pods-per-core", "10")
 	setIfUnset(args, "cgroup-driver", "systemd")
 	setIfUnset(args, "container-runtime-endpoint", options.DockerConfig.DockerShimSocket)
 	setIfUnset(args, "image-service-endpoint", options.DockerConfig.DockerShimSocket)
diff --git 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"}
 	}

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ func computeKubeControllerManagerArgs(kubeconfigFile, saPrivateKeyFile, saRootCA`
`63`	`63`	`if _, ok := cmdLineArgs["cluster-signing-key-file"]; !ok {`
`64`	`64`	`cmdLineArgs["cluster-signing-key-file"] = []string{""}`
`65`	`65`	`}`
`66`		`- if _, ok := cmdLineArgs["experimental-cluster-signing-duration"]; !ok {`
`67`		`- cmdLineArgs["experimental-cluster-signing-duration"] = []string{"720h"}`
`68`		`- }`
`69`	`66`	`if _, ok := cmdLineArgs["leader-elect-retry-period"]; !ok {`
`70`	`67`	`cmdLineArgs["leader-elect-retry-period"] = []string{"3s"}`
`71`	`68`	`}`