public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-21 18:07:16 +02:00
Code Issues Projects Releases Wiki Activity

Allow custom Postgres pod environment variables

Browse Source
This commit is contained in:
Georg Kunz
2017-12-14 14:39:33 +01:00
committed by Oleksii Kliukin
parent 87bc47d8d0
commit e8d9c75949
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/k8sres.go
+8
View File
@@ -362,6 +362,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
containerImage := c.OpConfig.DockerImage
if dockerImage != nil && *dockerImage != "" {
@@ -393,6 +400,7 @@ func (c *Cluster) generatePodTemplate(resourceRequirements *v1.ResourceRequireme
},
},
Env: envVars,
EnvFrom: envFromSource,
SecurityContext: &v1.SecurityContext{
Privileged: &privilegedMode,
},