WIP: Prevent quota reduction via CEL validation in StorageConsumer CRD

OdedViner · OdedViner · commit 734f0c7e8f81 · 2025-04-28T12:25:58.000+03:00
Signed-off-by: Oded Viner &lt;oviner@redhat.com&gt;
diff --git a/api/v1alpha1/storageconsumer_types.go b/api/v1alpha1/storageconsumer_types.go
@@ -38,6 +38,7 @@ const (
 )
 
 // StorageConsumerSpec defines the desired state of StorageConsumer
+// +kubebuilder:validation:XValidation:rule="self.storageQuotaInGiB >= oldSelf.storageQuotaInGiB",message="storageQuotaInGiB cannot be decreased on update"
 type StorageConsumerSpec struct {
 	// Enable flag ignores a reconcile if set to false
 	Enable bool `json:"enable,omitempty"`
diff --git a/config/crd/bases/ocs.openshift.io_storageconsumers.yaml b/config/crd/bases/ocs.openshift.io_storageconsumers.yaml
@@ -98,6 +98,9 @@ spec:
                   type: object
                 type: array
             type: object
+            x-kubernetes-validations:
+            - message: storageQuotaInGiB cannot be decreased on update
+              rule: self.storageQuotaInGiB >= oldSelf.storageQuotaInGiB
           status:
             description: StorageConsumerStatus defines the observed state of StorageConsumer
             properties:
diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml
@@ -98,6 +98,9 @@ spec:
                   type: object
                 type: array
             type: object
+            x-kubernetes-validations:
+            - message: storageQuotaInGiB cannot be decreased on update
+              rule: self.storageQuotaInGiB >= oldSelf.storageQuotaInGiB
           status:
             description: StorageConsumerStatus defines the observed state of StorageConsumer
             properties:
diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/deploy/ocs-operator/manifests/storageconsumer.crd.yaml
@@ -98,6 +98,9 @@ spec:
                   type: object
                 type: array
             type: object
+            x-kubernetes-validations:
+            - message: storageQuotaInGiB cannot be decreased on update
+              rule: self.storageQuotaInGiB >= oldSelf.storageQuotaInGiB
           status:
             description: StorageConsumerStatus defines the observed state of StorageConsumer
             properties:
diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ const (`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`// StorageConsumerSpec defines the desired state of StorageConsumer`
	`41`	`+// +kubebuilder:validation:XValidation:rule="self.storageQuotaInGiB >= oldSelf.storageQuotaInGiB",message="storageQuotaInGiB cannot be decreased on update"`
`41`	`42`	`type StorageConsumerSpec struct {`
`42`	`43`	`// Enable flag ignores a reconcile if set to false`
`43`	`44`	Enable bool `json:"enable,omitempty"`