From 969a06f521d2cda53bfa9f840f0558e385c2215d Mon Sep 17 00:00:00 2001
From: Murat Kabilov <murat@kabilov.com>
Date: Thu, 14 Sep 2017 11:07:34 +0200
Subject: [PATCH] Use DCS_ENABLE_KUBERNETES_API=true environment to enable
 kubernetes native deployment

---
 pkg/cluster/k8sres.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index 3298cb350..14ed17daf 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -241,10 +241,6 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
 			Name:  "PGROOT",
 			Value: constants.PostgresDataPath,
 		},
-		{
-			Name:  "ETCD_HOST",
-			Value: c.OpConfig.EtcdHost,
-		},
 		{
 			Name: "POD_IP",
 			ValueFrom: &v1.EnvVarSource{
@@ -304,11 +300,15 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
 	if c.OpConfig.WALES3Bucket != "" {
 		envVars = append(envVars, v1.EnvVar{Name: "WAL_S3_BUCKET", Value: c.OpConfig.WALES3Bucket})
 	}
+
+	if c.OpConfig.EtcdHost == "" {
+		envVars = append(envVars, v1.EnvVar{Name: "DCS_ENABLE_KUBERNETES_API", Value: "true"})
+	} else {
+		envVars = append(envVars, v1.EnvVar{Name: "ETCD_HOST", Value: c.OpConfig.EtcdHost})
+	}
+
 	if cloneDescription.ClusterName != "" {
-		cloneVars := c.generateCloneEnvironment(cloneDescription)
-		for _, v := range cloneVars {
-			envVars = append(envVars, v)
-		}
+		envVars = append(envVars, c.generateCloneEnvironment(cloneDescription)...)
 	}
 	privilegedMode := bool(true)
 	container := v1.Container{