Bug 1508061: Fix panic when accessing controller args

openshift · Nov 1, 2017 · 3b3a5d6 · 3b3a5d6
1 parent eec9d69
commit 3b3a5d6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/cmd/server/start/start_kube_controller_manager.go b/pkg/cmd/server/start/start_kube_controller_manager.go
@@ -49,9 +49,11 @@ func kubeControllerManagerAddFlags(cmserver *controlleroptions.CMServer) func(fl
 	}
 }
 
-func newKubeControllerManager(kubeconfigFile, saPrivateKeyFile, saRootCAFile, podEvictionTimeout, recyclerImage string, dynamicProvisioningEnabled bool, cmdLineArgs map[string][]string) (*controlleroptions.CMServer, []func(), error) {
-	if cmdLineArgs == nil {
-		cmdLineArgs = map[string][]string{}
+func newKubeControllerManager(kubeconfigFile, saPrivateKeyFile, saRootCAFile, podEvictionTimeout, recyclerImage string, dynamicProvisioningEnabled bool, controllerArgs map[string][]string) (*controlleroptions.CMServer, []func(), error) {
+	cmdLineArgs := map[string][]string{}
+	// deep-copy the input args to avoid mutation conflict.
+	for k, v := range controllerArgs {
+		cmdLineArgs[k] = v
 	}
 	cleanupFunctions := []func(){}