add sidecars to the restore job as well

Joshua Sierles · Joshua Sierles · commit a828316f6b59 · 2025-03-14T17:31:51.000+01:00
diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go
@@ -1391,6 +1391,14 @@ func (r *Reconciler) generateRestoreJobIntent(cluster *v1beta1.PostgresCluster,
 		}
 	}
 
+	// Add sidecars from RepoHost.Containers to the restore job
+	if cluster.Spec.Backups.PGBackRest.RepoHost != nil &&
+		cluster.Spec.Backups.PGBackRest.RepoHost.Containers != nil {
+		job.Spec.Template.Spec.Containers = append(
+			job.Spec.Template.Spec.Containers,
+			cluster.Spec.Backups.PGBackRest.RepoHost.Containers...)
+	}
+
 	// Set the image pull secrets, if any exist.
 	// This is set here rather than using the service account due to the lack
 	// of propagation to existing pods when the CRD is updated:

Original file line number	Diff line number	Diff line change
`@@ -1391,6 +1391,14 @@ func (r Reconciler) generateRestoreJobIntent(cluster v1beta1.PostgresCluster,`
`1391`	`1391`	`}`
`1392`	`1392`	`}`
`1393`	`1393`
	`1394`	`+ // Add sidecars from RepoHost.Containers to the restore job`
	`1395`	`+ if cluster.Spec.Backups.PGBackRest.RepoHost != nil &&`
	`1396`	`+ cluster.Spec.Backups.PGBackRest.RepoHost.Containers != nil {`
	`1397`	`+ job.Spec.Template.Spec.Containers = append(`
	`1398`	`+ job.Spec.Template.Spec.Containers,`
	`1399`	`+ cluster.Spec.Backups.PGBackRest.RepoHost.Containers...)`
	`1400`	`+ }`
	`1401`	`+`
`1394`	`1402`	`// Set the image pull secrets, if any exist.`
`1395`	`1403`	`// This is set here rather than using the service account due to the lack`
`1396`	`1404`	`// of propagation to existing pods when the CRD is updated:`