Don't need v1 of that struct

Author: benjaminjb

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

@@ -16107,39 +16107,42 @@ spec:
                             items:
                               properties:
                                 claimName:
-                                  description: A reference to a preexisting PVC.
+                                  description: Name of an existing PersistentVolumeClaim.
                                   maxLength: 253
                                   minLength: 1
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                                   type: string
                                 containers:
                                   description: |-
-                                    The containers to attach this volume to.
-                                    An omitted `Containers` field matches all containers.
-                                    An empty `Containers` field matches no containers.
+                                    The names of containers in which to mount this volume.
+                                    The default mounts the volume in *all* containers. An empty list does not mount the volume to any containers.
                                   items:
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                                     type: string
                                   maxItems: 10
                                   type: array
-                                  x-kubernetes-list-type: atomic
+                                  x-kubernetes-list-type: set
                                 name:
                                   allOf:
                                   - maxLength: 63
                                   - maxLength: 55
                                   description: |-
-                                    The name of the volume used for mounting path.
-                                    Volumes are mounted in the pods at `volumes/<NAME>`
-                                    Must be unique.
+                                    The name of the directory in which to mount this volume.
+                                    Volumes are mounted in containers at `/volumes/{name}`.
                                   minLength: 1
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                                   type: string
                                 readOnly:
-                                  description: Sets the write/read mode of the volume
+                                  description: When true, mount the volume read-only,
+                                    otherwise read-write. Defaults to false.
                                   type: boolean
                               required:
                               - claimName
                               - name
                               type: object
+                              x-kubernetes-map-type: atomic
                             maxItems: 10
                             type: array
                             x-kubernetes-list-map-keys:
@@ -34774,39 +34777,42 @@ spec:
                             items:
                               properties:
                                 claimName:
-                                  description: A reference to a preexisting PVC.
+                                  description: Name of an existing PersistentVolumeClaim.
                                   maxLength: 253
                                   minLength: 1
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                                   type: string
                                 containers:
                                   description: |-
-                                    The containers to attach this volume to.
-                                    An omitted `Containers` field matches all containers.
-                                    An empty `Containers` field matches no containers.
+                                    The names of containers in which to mount this volume.
+                                    The default mounts the volume in *all* containers. An empty list does not mount the volume to any containers.
                                   items:
+                                    maxLength: 63
+                                    minLength: 1
+                                    pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                                     type: string
                                   maxItems: 10
                                   type: array
-                                  x-kubernetes-list-type: atomic
+                                  x-kubernetes-list-type: set
                                 name:
                                   allOf:
                                   - maxLength: 63
                                   - maxLength: 55
                                   description: |-
-                                    The name of the volume used for mounting path.
-                                    Volumes are mounted in the pods at `volumes/<NAME>`
-                                    Must be unique.
+                                    The name of the directory in which to mount this volume.
+                                    Volumes are mounted in containers at `/volumes/{name}`.
                                   minLength: 1
                                   pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
                                   type: string
                                 readOnly:
-                                  description: Sets the write/read mode of the volume
+                                  description: When true, mount the volume read-only,
+                                    otherwise read-write. Defaults to false.
                                   type: boolean
                               required:
                               - claimName
                               - name
                               type: object
+                              x-kubernetes-map-type: atomic
                             maxItems: 10
                             type: array
                             x-kubernetes-list-map-keys:

pkg/apis/postgres-operator.crunchydata.com/v1/postgrescluster_types.go

@@ -525,23 +525,7 @@ type PostgresInstanceSetSpec struct {
 	// +optional
 	TablespaceVolumes []TablespaceVolume `json:"tablespaceVolumes,omitempty"`
 
-	Volumes *PostgresVolumesSpec `json:"volumes,omitempty"`
-}
-
-type PostgresVolumesSpec struct {
-	// Additional pre-existing volumes to add to the pod.
-	// ---
-	// +optional
-	// +listType=map
-	// +listMapKey=name
-	// +kubebuilder:validation:MaxItems=10
-	Additional []v1beta1.AdditionalVolume `json:"additional,omitempty"`
-
-	// An ephemeral volume for temporary files.
-	// More info: https://kubernetes.io/docs/concepts/storage/ephemeral-volumes
-	// ---
-	// +optional
-	Temp *v1beta1.VolumeClaimSpec `json:"temp,omitempty"`
+	Volumes *v1beta1.PostgresVolumesSpec `json:"volumes,omitempty"`
 }
 
 type TablespaceVolume struct {