Allow etcd parameters to be overridden

rancher · Jul 6, 2018 · d155cc8 · d155cc8
1 parent eb1fcc3
commit d155cc8
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/cluster/plan.go b/cluster/plan.go
@@ -124,6 +124,11 @@ func (c *Cluster) BuildKubeAPIProcess(prefixPath string) v3.Process {
 		"kubelet-client-certificate":      pki.GetCertPath(pki.KubeAPICertName),
 		"kubelet-client-key":              pki.GetKeyPath(pki.KubeAPICertName),
 		"service-account-key-file":        pki.GetKeyPath(pki.KubeAPICertName),
+		"etcd-cafile":                     etcdCAClientCert,
+		"etcd-certfile":                   etcdClientCert,
+		"etcd-keyfile":                    etcdClientKey,
+		"etcd-servers":                    etcdConnectionString,
+		"etcd-prefix":                     etcdPathPrefix,
 	}
 	if len(c.CloudProvider.Name) > 0 && c.CloudProvider.Name != aws.AWSCloudProviderName {
 		CommandArgs["cloud-config"] = CloudConfigPath
@@ -145,14 +150,6 @@ func (c *Cluster) BuildKubeAPIProcess(prefixPath string) v3.Process {
 		CommandArgs["apiserver-count"] = strconv.Itoa(len(c.ControlPlaneHosts))
 	}
 
-	args := []string{
-		"--etcd-cafile=" + etcdCAClientCert,
-		"--etcd-certfile=" + etcdClientCert,
-		"--etcd-keyfile=" + etcdClientKey,
-		"--etcd-servers=" + etcdConnectionString,
-		"--etcd-prefix=" + etcdPathPrefix,
-	}
-
 	if c.Authorization.Mode == services.RBACAuthorizationMode {
 		CommandArgs["authorization-mode"] = "Node,RBAC"
 	}
@@ -190,7 +187,6 @@ func (c *Cluster) BuildKubeAPIProcess(prefixPath string) v3.Process {
 	return v3.Process{
 		Name:                    services.KubeAPIContainerName,
 		Command:                 Command,
-		Args:                    args,
 		VolumesFrom:             VolumesFrom,
 		Binds:                   Binds,
 		Env:                     getUniqStringList(c.Services.KubeAPI.ExtraEnv),