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

adjust names of env vars

This commit is contained in:
Sergey Dudoladov 2019-04-23 18:11:38 +02:00
parent 0cac277541
commit 0f9d6dcad2
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/cluster/k8sres.go
View File

@ -1363,19 +1363,33 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
envVars := []v1.EnvVar{ envVars := []v1.EnvVar{
{ {
Name: "CLUSTER_NAME", Name: "SCOPE",
Value: c.Name, Value: c.Name,
}, },
// Bucket env vars
{ {
Name: "PG_PORT", Name: "LOGICAL_BACKUP_S3_BUCKET",
Value: c.OpConfig.LogicalBackup.LogicalBackupS3Bucket,
},
{
Name: "LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX",
Value: getBucketScopeSuffix(string(c.Postgresql.GetUID())),
},
// Postgres env vars
{
Name: "PGVERSION",
Value: c.Spec.PgVersion,
},
{
Name: "PGPORT",
Value: "5432", Value: "5432",
}, },
{ {
Name: "PGUSER", Name: "PGUSER__SUPERUSER",
Value: c.OpConfig.SuperUsername, Value: c.OpConfig.SuperUsername,
}, },
{ {
Name: "PGPASSWORD", Name: "PGPASSWORD_SUPERUSER",
ValueFrom: &v1.EnvVarSource{ ValueFrom: &v1.EnvVarSource{
SecretKeyRef: &v1.SecretKeySelector{ SecretKeyRef: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{ LocalObjectReference: v1.LocalObjectReference{
@ -1385,26 +1399,6 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
}, },
}, },
}, },
{
Name: "BUCKET",
Value: c.OpConfig.LogicalBackup.LogicalBackupS3Bucket,
},
{
Name: "BACKUP",
Value: c.Name,
},
{
Name: "PG_VERSION",
Value: c.Spec.PgVersion,
},
{
Name: "USE_LOGICAL_BACKUP_LABEL",
Value: "true",
},
{
Name: "LOGICAL_BACKUP_BUCKET_SCOPE_SUFFIX",
Value: getBucketScopeSuffix(string(c.Postgresql.GetUID())),
},
} }
c.logger.Debugf("Generated logical backup env vars %v", envVars) c.logger.Debugf("Generated logical backup env vars %v", envVars)