Allow no containers

Author: benjaminjb

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

@@ -11041,7 +11041,8 @@ spec:
                               containers:
                                 description: |-
                                   The containers to attach this volume to.
-                                  A blank/unset `Containers` field matches all containers.
+                                  An omitted `Containers` field matches all containers.
+                                  An empty `Containers` field matches no containers.
                                 items:
                                   type: string
                                 maxItems: 10
@@ -29655,7 +29656,8 @@ spec:
                               containers:
                                 description: |-
                                   The containers to attach this volume to.
-                                  A blank/unset `Containers` field matches all containers.
+                                  An omitted `Containers` field matches all containers.
+                                  An empty `Containers` field matches no containers.
                                 items:
                                   type: string
                                 maxItems: 10

internal/controller/postgrescluster/util.go

@@ -331,7 +331,8 @@ func addAdditionalVolumesToSpecifiedContainers(template *corev1.PodTemplateSpec,
 		// - https://github.com/kubernetes/api/blob/b40c1cacbb902b21a7e0c7bf0967321860c1a632/core/v1/types.go#L3895C27-L3896C33
 		names := sets.New(additionalVolumeRequest.Containers...)
 		allContainers := false
-		if names.Len() == 0 {
+		// If the containers list is omitted, we add the volume to all containers
+		if additionalVolumeRequest.Containers == nil {
 			allContainers = true
 		}
 

internal/controller/postgrescluster/util_test.go

@@ -403,9 +403,8 @@ func TestAddAdditionalVolumesToSpecifiedContainers(t *testing.T) {
 	}{{
 		tcName: "all",
 		additionalVolumes: []v1beta1.AdditionalVolume{{
-			Containers: []string{},
-			ClaimName:  "required",
-			Name:       "required",
+			ClaimName: "required",
+			Name:      "required",
 		}},
 		expectedContainers: `- name: database
   resources: {}
@@ -433,14 +432,75 @@ func TestAddAdditionalVolumesToSpecifiedContainers(t *testing.T) {
 		expectedMissing: []string{},
 	}, {
 		tcName: "multiple additional volumes",
+		additionalVolumes: []v1beta1.AdditionalVolume{{
+			ClaimName: "required",
+			Name:      "required",
+		}, {
+			ClaimName: "also",
+			Name:      "other",
+		}},
+		expectedContainers: `- name: database
+  resources: {}
+  volumeMounts:
+  - mountPath: /volumes/required
+    name: volumes-required
+  - mountPath: /volumes/other
+    name: volumes-other
+- name: other
+  resources: {}
+  volumeMounts:
+  - mountPath: /volumes/required
+    name: volumes-required
+  - mountPath: /volumes/other
+    name: volumes-other`,
+		expectedInitContainers: `- name: startup
+  resources: {}
+  volumeMounts:
+  - mountPath: /volumes/required
+    name: volumes-required
+  - mountPath: /volumes/other
+    name: volumes-other
+- name: config
+  resources: {}
+  volumeMounts:
+  - mountPath: /volumes/required
+    name: volumes-required
+  - mountPath: /volumes/other
+    name: volumes-other`,
+		expectedVolumes: `- name: volumes-required
+  persistentVolumeClaim:
+    claimName: required
+- name: volumes-other
+  persistentVolumeClaim:
+    claimName: also`,
+		expectedMissing: []string{},
+	}, {
+		tcName: "none",
 		additionalVolumes: []v1beta1.AdditionalVolume{{
 			Containers: []string{},
 			ClaimName:  "required",
 			Name:       "required",
+		}},
+		expectedContainers: `- name: database
+  resources: {}
+- name: other
+  resources: {}`,
+		expectedInitContainers: `- name: startup
+  resources: {}
+- name: config
+  resources: {}`,
+		expectedVolumes: `- name: volumes-required
+  persistentVolumeClaim:
+    claimName: required`,
+		expectedMissing: []string{},
+	}, {
+		tcName: "multiple additional volumes",
+		additionalVolumes: []v1beta1.AdditionalVolume{{
+			ClaimName: "required",
+			Name:      "required",
 		}, {
-			Containers: []string{},
-			ClaimName:  "also",
-			Name:       "other",
+			ClaimName: "also",
+			Name:      "other",
 		}},
 		expectedContainers: `- name: database
   resources: {}

pkg/apis/postgres-operator.crunchydata.com/v1/zz_generated.deepcopy.go

@@ -559,7 +559,8 @@ type AdditionalVolume struct {
 	ClaimName DNS1123Subdomain `json:"claimName"`
 
 	// The containers to attach this volume to.
-	// A blank/unset `Containers` field matches all containers.
+	// An omitted `Containers` field matches all containers.
+	// An empty `Containers` field matches no containers.
 	// ---
 	// +optional
 	// +listType=atomic