Change util.AddAdditionalVolumesAndMounts to take a PodSpec

This was the only field of the template it used.

Author: cbandy

internal/controller/postgrescluster/instance.go

@@ -1214,7 +1214,7 @@ func (r *Reconciler) reconcileInstance(
 
 	// mount additional volumes to the Postgres instance containers
 	if err == nil && spec.Volumes != nil && len(spec.Volumes.Additional) > 0 {
-		missingContainers := util.AddAdditionalVolumesAndMounts(&instance.Spec.Template, spec.Volumes.Additional)
+		missingContainers := util.AddAdditionalVolumesAndMounts(&instance.Spec.Template.Spec, spec.Volumes.Additional)
 
 		if len(missingContainers) > 0 {
 			r.Recorder.Eventf(cluster, corev1.EventTypeWarning, "SpecifiedContainerNotFound",

internal/controller/postgrescluster/pgbackrest.go

@@ -721,7 +721,7 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster
 
 	// mount additional volumes to the repo host containers
 	if repoHost != nil && repoHost.Volumes != nil && len(repoHost.Volumes.Additional) > 0 {
-		missingContainers := util.AddAdditionalVolumesAndMounts(&repo.Spec.Template, repoHost.Volumes.Additional)
+		missingContainers := util.AddAdditionalVolumesAndMounts(&repo.Spec.Template.Spec, repoHost.Volumes.Additional)
 
 		if len(missingContainers) > 0 {
 			r.Recorder.Eventf(postgresCluster, corev1.EventTypeWarning, "SpecifiedContainerNotFound",
@@ -908,7 +908,7 @@ func (r *Reconciler) generateBackupJobSpecIntent(ctx context.Context, postgresCl
 
 	// mount additional volumes to the job containers
 	if jobs != nil && jobs.Volumes != nil && len(jobs.Volumes.Additional) > 0 {
-		missingContainers := util.AddAdditionalVolumesAndMounts(&jobSpec.Template, jobs.Volumes.Additional)
+		missingContainers := util.AddAdditionalVolumesAndMounts(&jobSpec.Template.Spec, jobs.Volumes.Additional)
 
 		if len(missingContainers) > 0 {
 			r.Recorder.Eventf(postgresCluster, corev1.EventTypeWarning, "SpecifiedContainerNotFound",
@@ -1408,7 +1408,7 @@ func (r *Reconciler) generateRestoreJobIntent(cluster *v1beta1.PostgresCluster,
 	job.Spec.Template.Spec.PriorityClassName = initialize.FromPointer(dataSource.PriorityClassName)
 
 	if dataSource.Volumes != nil && len(dataSource.Volumes.Additional) > 0 {
-		missingContainers := util.AddAdditionalVolumesAndMounts(&job.Spec.Template, dataSource.Volumes.Additional)
+		missingContainers := util.AddAdditionalVolumesAndMounts(&job.Spec.Template.Spec, dataSource.Volumes.Additional)
 
 		if len(missingContainers) > 0 {
 			r.Recorder.Eventf(cluster, corev1.EventTypeWarning, "SpecifiedContainerNotFound",

internal/controller/postgrescluster/pgbouncer.go

@@ -478,7 +478,7 @@ func (r *Reconciler) generatePGBouncerDeployment(
 
 	// mount additional volumes to the pgbouncer containers
 	if volumes := cluster.Spec.Proxy.PGBouncer.Volumes; err == nil && volumes != nil && len(volumes.Additional) > 0 {
-		missingContainers := util.AddAdditionalVolumesAndMounts(&deploy.Spec.Template, volumes.Additional)
+		missingContainers := util.AddAdditionalVolumesAndMounts(&deploy.Spec.Template.Spec, volumes.Additional)
 
 		if len(missingContainers) > 0 {
 			r.Recorder.Eventf(cluster, corev1.EventTypeWarning, "SpecifiedContainerNotFound",

internal/controller/standalone_pgadmin/statefulset.go

@@ -141,7 +141,7 @@ func (r *PGAdminReconciler) statefulset(
 
 	// mount additional volumes to the Postgres instance containers
 	if pgadmin.Spec.Volumes != nil && len(pgadmin.Spec.Volumes.Additional) > 0 {
-		missingContainers := util.AddAdditionalVolumesAndMounts(&sts.Spec.Template, pgadmin.Spec.Volumes.Additional)
+		missingContainers := util.AddAdditionalVolumesAndMounts(&sts.Spec.Template.Spec, pgadmin.Spec.Volumes.Additional)
 
 		if len(missingContainers) > 0 {
 			r.Recorder.Eventf(pgadmin, corev1.EventTypeWarning, "SpecifiedContainerNotFound",

internal/util/volumes.go

@@ -22,14 +22,14 @@ func AdditionalVolumeMount(name string, readOnly bool) corev1.VolumeMount {
 	}
 }
 
-// AddAdditionalVolumesAndMounts adds volumes as [corev1.Volume]s and [corev1.VolumeMount]s in template.
+// AddAdditionalVolumesAndMounts adds volumes as [corev1.Volume]s and [corev1.VolumeMount]s in pod.
 // Volume names are chosen in [AdditionalVolumeMount].
-func AddAdditionalVolumesAndMounts(template *corev1.PodTemplateSpec, volumes []v1beta1.AdditionalVolume) []string {
+func AddAdditionalVolumesAndMounts(pod *corev1.PodSpec, volumes []v1beta1.AdditionalVolume) []string {
 	missingContainers := []string{}
 
 	for _, spec := range volumes {
 		mount := AdditionalVolumeMount(spec.Name, spec.ReadOnly)
-		template.Spec.Volumes = append(template.Spec.Volumes, spec.AsVolume(mount.Name))
+		pod.Volumes = append(pod.Volumes, spec.AsVolume(mount.Name))
 
 		// Create a set of all the requested containers,
 		// then in the loops below when we attach the volume to a container,
@@ -39,18 +39,18 @@ func AddAdditionalVolumesAndMounts(template *corev1.PodTemplateSpec, volumes []v
 		// - https://github.com/kubernetes/api/blob/b40c1cacbb902b21a7e0c7bf0967321860c1a632/core/v1/types.go#L3895C27-L3896C33
 		names := sets.New(spec.Containers...)
 
-		for i, c := range template.Spec.Containers {
+		for i, c := range pod.Containers {
 			if spec.Containers == nil || names.Has(c.Name) {
 				c.VolumeMounts = append(c.VolumeMounts, mount)
-				template.Spec.Containers[i] = c
+				pod.Containers[i] = c
 			}
 			names.Delete(c.Name)
 		}
 
-		for i, c := range template.Spec.InitContainers {
+		for i, c := range pod.InitContainers {
 			if spec.Containers == nil || names.Has(c.Name) {
 				c.VolumeMounts = append(c.VolumeMounts, mount)
-				template.Spec.InitContainers[i] = c
+				pod.InitContainers[i] = c
 			}
 			names.Delete(c.Name)
 		}

internal/util/volumes_test.go

@@ -5,6 +5,7 @@
 package util
 
 import (
+	"slices"
 	"testing"
 
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -19,16 +20,16 @@ import (
 func TestAddAdditionalVolumesAndMounts(t *testing.T) {
 	t.Parallel()
 
-	podTemplate := &corev1.PodTemplateSpec{
-		Spec: corev1.PodSpec{
-			InitContainers: []corev1.Container{
-				{Name: "startup"},
-				{Name: "config"},
-			},
-			Containers: []corev1.Container{
-				{Name: "database"},
-				{Name: "other"},
-			}}}
+	podSpec := corev1.PodSpec{
+		InitContainers: []corev1.Container{
+			{Name: "startup"},
+			{Name: "config"},
+		},
+		Containers: []corev1.Container{
+			{Name: "database"},
+			{Name: "other"},
+		},
+	}
 
 	testCases := []struct {
 		tcName                 string
@@ -253,33 +254,16 @@ func TestAddAdditionalVolumesAndMounts(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.tcName, func(t *testing.T) {
-			copyPodTemplate := podTemplate.DeepCopy()
+			sink := podSpec.DeepCopy()
+			missingContainers := AddAdditionalVolumesAndMounts(sink, tc.additionalVolumes)
 
-			missingContainers := AddAdditionalVolumesAndMounts(
-				copyPodTemplate,
-				tc.additionalVolumes,
-			)
+			assert.Assert(t, cmp.MarshalMatches(sink.Containers, tc.expectedContainers))
+			assert.Assert(t, cmp.MarshalMatches(sink.InitContainers, tc.expectedInitContainers))
+			assert.Assert(t, cmp.MarshalMatches(sink.Volumes, tc.expectedVolumes))
 
-			assert.Assert(t, cmp.MarshalMatches(
-				copyPodTemplate.Spec.Containers,
-				tc.expectedContainers))
-			assert.Assert(t, cmp.MarshalMatches(
-				copyPodTemplate.Spec.InitContainers,
-				tc.expectedInitContainers))
-			assert.Assert(t, cmp.MarshalMatches(
-				copyPodTemplate.Spec.Volumes,
-				tc.expectedVolumes))
-			if len(tc.expectedMissing) == 0 {
-				assert.Assert(t, cmp.DeepEqual(
-					missingContainers,
-					tc.expectedMissing))
-			} else {
-				for _, mc := range tc.expectedMissing {
-					assert.Assert(t, cmp.Contains(
-						missingContainers,
-						mc))
-				}
-			}
+			slices.Sort(missingContainers)
+			slices.Sort(tc.expectedMissing)
+			assert.DeepEqual(t, missingContainers, tc.expectedMissing)
 		})
 	}
 }