hold

Author: benjaminjb

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

@@ -11033,6 +11033,7 @@ spec:
                             properties:
                               claimName:
                                 description: A reference to a preexisting PVC.
+                                maxLength: 10
                                 type: string
                               claimTemplate:
                                 description: A PVC request.
@@ -11248,12 +11249,20 @@ spec:
                                 items:
                                   type: string
                                 type: array
-                                x-kubernetes-list-type: set
+                                x-kubernetes-list-type: atomic
                               name:
+                                allOf:
+                                - maxLength: 253
+                                - maxLength: 10
                                 description: |-
                                   The name of the volume used for mounting path.
                                   Must be unique.
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                                 type: string
+                                x-kubernetes-validations:
+                                - message: immutable
+                                  rule: self == oldSelf
                               readOnly:
                                 description: Sets the write/read mode of the volume
                                 type: boolean
@@ -29845,6 +29854,7 @@ spec:
                             properties:
                               claimName:
                                 description: A reference to a preexisting PVC.
+                                maxLength: 10
                                 type: string
                               claimTemplate:
                                 description: A PVC request.
@@ -30060,19 +30070,27 @@ spec:
                                 items:
                                   type: string
                                 type: array
-                                x-kubernetes-list-type: set
+                                x-kubernetes-list-type: atomic
                               name:
+                                allOf:
+                                - maxLength: 253
+                                - maxLength: 10
                                 description: |-
                                   The name of the volume used for mounting path.
                                   Must be unique.
+                                minLength: 1
+                                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                                 type: string
+                                x-kubernetes-validations:
+                                - message: immutable
+                                  rule: self == oldSelf
                               readOnly:
                                 description: Sets the write/read mode of the volume
                                 type: boolean
                             required:
                             - name
                             type: object
-                          maxItems: 10
+                          maxItems: 1
                           type: array
                           x-kubernetes-list-map-keys:
                           - name

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

@@ -542,7 +542,7 @@ type PostgresVolumesSpec struct {
 	// +listType=map
 	// +listMapKey=name
 	// +kubebuilder:validation:MaxItems=10
-	// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x == true).size() <= 1`,message=`can only have one of claimName, claimTemplate`
+	// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x).size() <= 1`,message=`can only have one of claimName, claimTemplate`
 	Additional []*v1beta1.AdditionalVolume `json:"additional,omitempty"`
 }
 

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

@@ -539,8 +539,9 @@ type PostgresVolumesSpec struct {
 	// +optional
 	// +listType=map
 	// +listMapKey=name
-	// +kubebuilder:validation:MaxItems=10
-	// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x == true).size() <= 1`,message=`can only have one of claimName, claimTemplate`
+	// +kubebuilder:validation:MaxItems=1
+	// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x).size() <= 1`,message=`can only have one of claimName, claimTemplate`
+	// // +kubebuilder:validation:items:XValidation:rule=`has(oldSelf.claimTemplate) != has(self.claimTemplate)`,message=`testing`
 	Additional []*AdditionalVolume `json:"additional,omitempty"`
 }
 
@@ -549,12 +550,15 @@ type AdditionalVolume struct {
 	// Must be unique.
 	// ---
 	// +kubebuilder:validation:Required
-	// // +kubebuilder:validation:XValidation:rule=`self == oldSelf`,message="immutable"
-	Name string `json:"name,omitempty"`
+	// TODO: CHANGE THE MAX LENGTH
+	// +kubebuilder:validation:MaxLength=10
+	Name DNS1123Subdomain `json:"name,omitempty"`
 
 	// A reference to a preexisting PVC.
 	// ---
 	// +optional
+	// TODO: CHANGE THE MAX LENGTH
+	// +kubebuilder:validation:MaxLength=10
 	// // +kubebuilder:validation:XValidation:rule=`self == oldSelf`,message="immutable"
 	ClaimName string `json:"claimName,omitempty"`
 
@@ -567,6 +571,7 @@ type AdditionalVolume struct {
 	// ---
 	// +optional
 	// +listType=set
+	// +listType=atomic
 	Containers []string `json:"containers,omitempty"`
 
 	// Sets the write/read mode of the volume