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

fix TestGenerateSpiloJSONConfiguration

This commit is contained in:
Sergey Dudoladov 2020-10-14 07:27:33 +02:00
parent 1386b1f7c8
commit 1a4357ad8f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cluster/k8sres.go
View File

@ -649,10 +649,6 @@ func (c *Cluster) generateSpiloPodEnvVars(uid types.UID, spiloConfiguration stri
Name: "PGROOT", Name: "PGROOT",
Value: constants.PostgresDataPath, Value: constants.PostgresDataPath,
}, },
{
Name: "PGVERSION",
Value: c.Spec.PgVersion,
},
{ {
Name: "POD_IP", Name: "POD_IP",
ValueFrom: &v1.EnvVarSource{ ValueFrom: &v1.EnvVarSource{
@ -717,6 +713,10 @@ func (c *Cluster) generateSpiloPodEnvVars(uid types.UID, spiloConfiguration stri
Name: "HUMAN_ROLE", Name: "HUMAN_ROLE",
Value: c.OpConfig.PamRoleName, Value: c.OpConfig.PamRoleName,
}, },
{
Name: "PGVERSION",
Value: c.Spec.PgVersion,
},
} }
// Spilo expects cluster labels as JSON // Spilo expects cluster labels as JSON
if clusterLabels, err := json.Marshal(labels.Set(c.OpConfig.ClusterLabels)); err != nil { if clusterLabels, err := json.Marshal(labels.Set(c.OpConfig.ClusterLabels)); err != nil {

2
pkg/cluster/k8sres_test.go
View File

@ -67,7 +67,7 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
patroni: &acidv1.Patroni{}, patroni: &acidv1.Patroni{},
role: "zalandos", role: "zalandos",
opConfig: config.Config{}, opConfig: config.Config{},
result: `{"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{}}}`, result: `{"postgresql":{},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{}}}`,
}, },
{ {
subtest: "Patroni configured", subtest: "Patroni configured",