Adjust some tests.

Author: dsessler7

internal/controller/postgrescluster/pgbackrest_test.go

@@ -2606,11 +2606,9 @@ func TestGenerateBackupJobIntent(t *testing.T) {
 	require.ParallelCapacity(t, 0)
 	ns := setupNamespace(t, cc)
 
-	recorder := events.NewRecorder(t, runtime.Scheme)
 	r := &Reconciler{
-		Client:   cc,
-		Recorder: recorder,
-		Owner:    ControllerName,
+		Client: cc,
+		Owner:  ControllerName,
 	}
 
 	ctx := context.Background()
@@ -2916,6 +2914,9 @@ volumes:
 	})
 
 	t.Run("CloudLogVolumeAnnotationNoPvc", func(t *testing.T) {
+		recorder := events.NewRecorder(t, runtime.Scheme)
+		r.Recorder = recorder
+
 		cluster.Namespace = ns.Name
 		cluster.Annotations = map[string]string{}
 		cluster.Annotations[naming.PGBackRestCloudLogVolume] = "some-pvc"
@@ -2985,6 +2986,9 @@ volumes:
 	})
 
 	t.Run("CloudLogVolumeAnnotationPvcInPlace", func(t *testing.T) {
+		recorder := events.NewRecorder(t, runtime.Scheme)
+		r.Recorder = recorder
+
 		cluster.Namespace = ns.Name
 		cluster.Annotations = map[string]string{}
 		cluster.Annotations[naming.PGBackRestCloudLogVolume] = "another-pvc"
@@ -3063,11 +3067,8 @@ volumes:
     claimName: another-pvc
 		`))
 
-		// No new events
-		assert.Equal(t, len(recorder.Events), 1)
-		assert.Equal(t, recorder.Events[0].Regarding.Name, cluster.Name)
-		assert.Equal(t, recorder.Events[0].Reason, "PGBackRestCloudLogVolumeNotFound")
-		assert.Equal(t, recorder.Events[0].Note, "persistentvolumeclaims \"some-pvc\" not found")
+		// No events created
+		assert.Equal(t, len(recorder.Events), 0)
 	})
 }
 

internal/util/volumes_test.go

@@ -22,6 +22,10 @@ func TestAddVolumeAndMountsToPod(t *testing.T) {
 			{Name: "other"},
 			{Name: "pgbackrest"},
 		},
+		InitContainers: []corev1.Container{
+			{Name: "initializer"},
+			{Name: "another"},
+		},
 	}
 
 	volume := &corev1.PersistentVolumeClaim{
@@ -31,8 +35,8 @@ func TestAddVolumeAndMountsToPod(t *testing.T) {
 	}
 
 	alwaysExpect := func(t testing.TB, result *corev1.PodSpec) {
-		// Only Containers and Volumes fields have changed.
-		assert.DeepEqual(t, *pod, *result, cmpopts.IgnoreFields(*pod, "Containers", "Volumes"))
+		// Only Containers, InitContainers, and Volumes fields have changed.
+		assert.DeepEqual(t, *pod, *result, cmpopts.IgnoreFields(*pod, "Containers", "InitContainers", "Volumes"))
 
 		// Volume is mounted to all containers
 		assert.Assert(t, cmp.MarshalMatches(result.Containers, `
@@ -47,6 +51,20 @@ func TestAddVolumeAndMountsToPod(t *testing.T) {
   - mountPath: /volumes/volume-name
     name: volume-name
 - name: pgbackrest
+  resources: {}
+  volumeMounts:
+  - mountPath: /volumes/volume-name
+    name: volume-name
+		`))
+
+		// Volume is mounted to all init containers
+		assert.Assert(t, cmp.MarshalMatches(result.InitContainers, `
+- name: initializer
+  resources: {}
+  volumeMounts:
+  - mountPath: /volumes/volume-name
+    name: volume-name
+- name: another
   resources: {}
   volumeMounts:
   - mountPath: /volumes/volume-name