fix env vars config ordering

kubernetes · Jan 25, 2020 · 4d19dca · 4d19dca
1 parent b7d876a
commit 4d19dca
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
@@ -252,17 +252,6 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster *kops.EtcdClusterSpec) (*v1.Po
 			container.Image = etcdCluster.Manager.Image
 		}
 
-		if etcdCluster.Manager != nil && len(etcdCluster.Manager.EtcdConfigOverwrite) > 0 {
-			for name, value := range etcdCluster.Manager.EtcdConfigOverwrite {
-				klog.Warningf("overloading ENV var in manifest %s with %s=%s", bundle, name, value)
-				configOverwrite := v1.EnvVar{
-					Name:  name,
-					Value: value,
-				}
-
-				container.Env = append(container.Env, configOverwrite)
-			}
-		}
 	}
 
 	// With etcd-manager the hosts changes are self-contained, so
@@ -489,6 +478,18 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster *kops.EtcdClusterSpec) (*v1.Po
 
 	container.Env = envMap.ToEnvVars()
 
+	if etcdCluster.Manager != nil && len(etcdCluster.Manager.EtcdConfigOverwrite) > 0 {
+		for name, value := range etcdCluster.Manager.EtcdConfigOverwrite {
+			klog.Warningf("overloading ENV var in manifest %s with %s=%s", bundle, name, value)
+			configOverwrite := v1.EnvVar{
+				Name:  name,
+				Value: value,
+			}
+
+			container.Env = append(container.Env, configOverwrite)
+		}
+	}
+
 	{
 		foundPKI := false
 		for i := range pod.Spec.Volumes {