Allow custom Postgres pod environment variables

This commit is contained in:
Georg Kunz
2017-11-06 13:42:03 +01:00
parent 86803406db
commit 257e0fc0a9
3 changed files with 41 additions and 0 deletions
+8
View File
@@ -361,6 +361,13 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
if cloneDescription.ClusterName != "" {
envVars = append(envVars, c.generateCloneEnvironment(cloneDescription)...)
}
envFromSource := []v1.EnvFromSource{}
if c.OpConfig.PodEnvironmentConfigMap != "" {
configMapRef := v1.ConfigMapEnvSource{LocalObjectReference: v1.LocalObjectReference{Name: c.OpConfig.PodEnvironmentConfigMap}}
envFromSource = append(envFromSource, v1.EnvFromSource{ConfigMapRef: &configMapRef})
}
privilegedMode := true
container := v1.Container{
Name: c.containerName(),
@@ -388,6 +395,7 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
},
},
Env: envVars,
EnvFrom: envFromSource,
SecurityContext: &v1.SecurityContext{
Privileged: &privilegedMode,
},