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

Defaults for user/schema fix 

Verify the defaul values only if the schema doesn't override them.
This commit is contained in:
Dmitrii Dolgov 2020-03-19 11:28:39 +01:00
parent 48cdbb6a65
commit 20b2fb4642
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/cluster.go
View File

@ -1316,7 +1316,7 @@ func (c *Cluster) needSyncConnPoolDefaults(
} }
for _, env := range poolContainer.Env { for _, env := range poolContainer.Env {
if env.Name == "PGUSER" { if spec.User == "" && env.Name == "PGUSER" {
ref := env.ValueFrom.SecretKeyRef.LocalObjectReference ref := env.ValueFrom.SecretKeyRef.LocalObjectReference
if ref.Name != c.credentialSecretName(config.User) { if ref.Name != c.credentialSecretName(config.User) {
@ -1327,7 +1327,7 @@ func (c *Cluster) needSyncConnPoolDefaults(
} }
} }
if env.Name == "PGSCHEMA" && env.Value != config.Schema { if spec.Schema == "" && env.Name == "PGSCHEMA" && env.Value != config.Schema {
sync = true sync = true
msg := fmt.Sprintf("Pool schema is different (having %s, required %s)", msg := fmt.Sprintf("Pool schema is different (having %s, required %s)",
env.Value, config.Schema) env.Value, config.Schema)