public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use DCS_ENABLE_KUBERNETES_API=true environment to enable kubernetes native deployment

This commit is contained in:
Murat Kabilov 2017-09-14 11:07:34 +02:00
parent 8430ee86c9
commit 969a06f521
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cluster/k8sres.go
View File

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