Skip to content

Changes to support separate bucket per pg cluster (#1209) #1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to support separate bucket per pg cluster (#1209) #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions pkg/cluster/k8sres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,6 @@ func (c *Cluster) generateSpiloPodEnvVars(uid types.UID, spiloConfiguration stri
}

if c.OpConfig.WALES3Bucket != "" {
envVars = append(envVars, v1.EnvVar{Name: "WAL_S3_BUCKET", Value: c.OpConfig.WALES3Bucket})
envVars = append(envVars, v1.EnvVar{Name: "WAL_BUCKET_SCOPE_SUFFIX", Value: getBucketScopeSuffix(string(uid))})
envVars = append(envVars, v1.EnvVar{Name: "WAL_BUCKET_SCOPE_PREFIX", Value: ""})
}
Expand All @@ -762,6 +761,13 @@ func (c *Cluster) generateSpiloPodEnvVars(uid types.UID, spiloConfiguration stri
envVars = append(envVars, v1.EnvVar{Name: "LOG_BUCKET_SCOPE_PREFIX", Value: ""})
}

// Get WAL_S3_BUCKET env var from customPodEnvVarsList, if present. Priority to be given to customPodEnvVarsList
if getEnvValue("WAL_S3_BUCKET", customPodEnvVarsList) != "" {
envVars = append(envVars, v1.EnvVar{Name: "WAL_S3_BUCKET", Value: getEnvValue("WAL_S3_BUCKET", customPodEnvVarsList)})
} else if c.OpConfig.WALES3Bucket != "" {
envVars = append(envVars, v1.EnvVar{Name: "WAL_S3_BUCKET", Value: c.OpConfig.WALES3Bucket})
}

return envVars
}

Expand Down Expand Up @@ -1857,7 +1863,15 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
return nil, fmt.Errorf("could not generate resource requirements for logical backup pods: %v", err)
}

envVars := c.generateLogicalBackupPodEnvVars()
// fetch env vars from custom ConfigMap
customPodEnvVarsList, err := c.getPodEnvironmentConfigMapVariables()
if err != nil {
return nil, err
}
sort.Slice(customPodEnvVarsList,
func(i, j int) bool { return customPodEnvVarsList[i].Name < customPodEnvVarsList[j].Name })

envVars := deduplicateEnvVars(c.generateLogicalBackupPodEnvVars(customPodEnvVarsList), c.containerName(), c.logger)
logicalBackupContainer := generateContainer(
"logical-backup",
&c.OpConfig.LogicalBackup.LogicalBackupDockerImage,
Expand Down Expand Up @@ -1952,7 +1966,7 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
return cronJob, nil
}

func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
func (c *Cluster) generateLogicalBackupPodEnvVars(customPodEnvVarsList []v1.EnvVar) []v1.EnvVar {

envVars := []v1.EnvVar{
{
Expand All @@ -1973,10 +1987,6 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
},
},
// Bucket env vars
{
Name: "LOGICAL_BACKUP_S3_BUCKET",
Value: c.OpConfig.LogicalBackup.LogicalBackupS3Bucket,
},
{
Name: "LOGICAL_BACKUP_S3_REGION",
Value: c.OpConfig.LogicalBackup.LogicalBackupS3Region,
Expand Down Expand Up @@ -2027,6 +2037,13 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
},
}

// Get LOGICAL_BACKUP_S3_BUCKET env var from customPodEnvVarsList, if present. Priority to be given to customPodEnvVarsList
if getEnvValue("LOGICAL_BACKUP_S3_BUCKET", customPodEnvVarsList) != "" {
envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_S3_BUCKET", Value: getEnvValue("LOGICAL_BACKUP_S3_BUCKET", customPodEnvVarsList)})
} else if c.OpConfig.LogicalBackup.LogicalBackupS3Bucket != "" {
envVars = append(envVars, v1.EnvVar{Name: "LOGICAL_BACKUP_S3_BUCKET", Value: c.OpConfig.LogicalBackup.LogicalBackupS3Bucket})
}

if c.OpConfig.LogicalBackup.LogicalBackupS3AccessKeyID != "" {
envVars = append(envVars, v1.EnvVar{Name: "AWS_ACCESS_KEY_ID", Value: c.OpConfig.LogicalBackup.LogicalBackupS3AccessKeyID})
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/cluster/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,3 +549,13 @@ func mergeContainers(containers ...[]v1.Container) ([]v1.Container, []string) {
}
return result, conflicts
}

// Get env key's value from env list
func getEnvValue(envKey string, customPodEnvVarsList []v1.EnvVar) string {
for _, customEnvVar := range customPodEnvVarsList {
if customEnvVar.Name == envKey {
return customEnvVar.Value
}
}
return ""
}