Skip to content

Commit 32d5f54

Browse files
author
Joshua Sierles
committed
Apply env vars to restore sidecars as well
1 parent a828316 commit 32d5f54

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

internal/controller/postgrescluster/pgbackrest.go

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,9 +1394,32 @@ func (r *Reconciler) generateRestoreJobIntent(cluster *v1beta1.PostgresCluster,
13941394
// Add sidecars from RepoHost.Containers to the restore job
13951395
if cluster.Spec.Backups.PGBackRest.RepoHost != nil &&
13961396
cluster.Spec.Backups.PGBackRest.RepoHost.Containers != nil {
1397+
1398+
// Get the sidecars from RepoHost
1399+
sidecars := cluster.Spec.Backups.PGBackRest.RepoHost.Containers
1400+
1401+
// If EnvFromSecret is specified, add the reference to each sidecar container
1402+
if cluster.Spec.Backups.PGBackRest.RepoHost.EnvFromSecret != nil {
1403+
secretName := *cluster.Spec.Backups.PGBackRest.RepoHost.EnvFromSecret
1404+
1405+
// Add the envFrom reference to each sidecar container
1406+
for i := range sidecars {
1407+
sidecars[i].EnvFrom = append(
1408+
sidecars[i].EnvFrom,
1409+
corev1.EnvFromSource{
1410+
SecretRef: &corev1.SecretEnvSource{
1411+
LocalObjectReference: corev1.LocalObjectReference{
1412+
Name: secretName,
1413+
},
1414+
},
1415+
})
1416+
}
1417+
}
1418+
1419+
// Add the sidecars to the job's containers
13971420
job.Spec.Template.Spec.Containers = append(
13981421
job.Spec.Template.Spec.Containers,
1399-
cluster.Spec.Backups.PGBackRest.RepoHost.Containers...)
1422+
sidecars...)
14001423
}
14011424

14021425
// Set the image pull secrets, if any exist.

0 commit comments

Comments
 (0)