Allow users to overwrite etcd settings.

Fix typo

fix env vars config  ordering

k8s/crds/kops.k8s.io_clusters.yaml

@@ -631,6 +631,13 @@ spec:
                   manager:
                     description: Manager describes the manager configuration
                     properties:
+                      etcdConfigOverwrite:
+                        additionalProperties:
+                          type: string
+                        description: EtcdConfigOverwrite allows etcd setting to be
+                          overwritten with ENV variables. The setting are not validated.
+                          A list of config ENV vars can be found at https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/configuration.md
+                        type: object
                       image:
                         description: Image is the etcd manager image to use.
                         type: string

pkg/apis/kops/cluster.go

@@ -456,6 +456,9 @@ type EtcdBackupSpec struct {
 type EtcdManagerSpec struct {
 	// Image is the etcd manager image to use.
 	Image string `json:"image,omitempty"`
+	// EtcdConfigOverwrite allows etcd setting to be overwritten with ENV variables. The setting are not validated.
+	// A list of config ENV vars can be found at https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/configuration.md
+	EtcdConfigOverwrite map[string]string `json:"etcdConfigOverwrite,omitempty"`
 }
 
 // EtcdMemberSpec is a specification for a etcd member

pkg/apis/kops/v1alpha1/cluster.go

@@ -454,6 +454,9 @@ type EtcdBackupSpec struct {
 type EtcdManagerSpec struct {
 	// Image is the etcd manager image to use.
 	Image string `json:"image,omitempty"`
+	// EtcdConfigOverwrite allows etcd setting to be overwritten with ENV variables. The setting are not validated.
+	// A list of config ENV vars can be found at https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/configuration.md
+	EtcdConfigOverwrite map[string]string `json:"etcdConfigOverwrite,omitempty"`
 }
 
 // EtcdMemberSpec is a specification for a etcd member

pkg/apis/kops/v1alpha2/cluster.go

@@ -454,6 +454,9 @@ type EtcdBackupSpec struct {
 type EtcdManagerSpec struct {
 	// Image is the etcd manager image to use.
 	Image string `json:"image,omitempty"`
+	// EtcdConfigOverwrite allows etcd setting to be overwritten with ENV variables. The setting are not validated.
+	// A list of config ENV vars can be found at https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/configuration.md
+	EtcdConfigOverwrite map[string]string `json:"etcdConfigOverwrite,omitempty"`
 }
 
 // EtcdMemberSpec is a specification for a etcd member

pkg/model/components/etcdmanager/model.go

@@ -251,6 +251,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster *kops.EtcdClusterSpec) (*v1.Po
 			klog.Warningf("overloading image in manifest %s with images %s", bundle, etcdCluster.Manager.Image)
 			container.Image = etcdCluster.Manager.Image
 		}
+
 	}
 
 	// With etcd-manager the hosts changes are self-contained, so
@@ -477,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 {