WIP: Prevent quota reduction via CEL validation in StorageConsumer CRD

OdedViner · OdedViner · commit 9d8b3304492a · 2025-04-25T18:42:21.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
@@ -104,6 +104,7 @@ type StorageConsumerStatus struct {
 }
 
 // ClientStatus is the information pushed from connected storage client
+// +kubebuilder:validation:XValidation:rule="!(has(oldSelf.storageQuotaUtilizationRatio) && self.storageQuotaUtilizationRatio < oldSelf.storageQuotaUtilizationRatio)",message="storageQuotaUtilizationRatio cannot be decreased on update"
 type ClientStatus struct {
 	// StorageClient Platform Version
 	// +optional
diff --git a/config/crd/bases/ocs.openshift.io_storageconsumers.yaml b/config/crd/bases/ocs.openshift.io_storageconsumers.yaml
@@ -154,6 +154,10 @@ spec:
                       quota of connected client
                     type: number
                 type: object
+                x-kubernetes-validations:
+                - message: storageQuotaUtilizationRatio cannot be decreased on update
+                  rule: '!(has(oldSelf.storageQuotaUtilizationRatio) && self.storageQuotaUtilizationRatio
+                    < oldSelf.storageQuotaUtilizationRatio)'
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer
                 format: date-time
diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml
@@ -154,6 +154,10 @@ spec:
                       quota of connected client
                     type: number
                 type: object
+                x-kubernetes-validations:
+                - message: storageQuotaUtilizationRatio cannot be decreased on update
+                  rule: '!(has(oldSelf.storageQuotaUtilizationRatio) && self.storageQuotaUtilizationRatio
+                    < oldSelf.storageQuotaUtilizationRatio)'
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer
                 format: date-time
diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/deploy/ocs-operator/manifests/storageconsumer.crd.yaml
@@ -154,6 +154,10 @@ spec:
                       quota of connected client
                     type: number
                 type: object
+                x-kubernetes-validations:
+                - message: storageQuotaUtilizationRatio cannot be decreased on update
+                  rule: '!(has(oldSelf.storageQuotaUtilizationRatio) && self.storageQuotaUtilizationRatio
+                    < oldSelf.storageQuotaUtilizationRatio)'
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer
                 format: date-time
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
`@@ -104,6 +104,7 @@ type StorageConsumerStatus struct {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// ClientStatus is the information pushed from connected storage client`
	`107`	`+// +kubebuilder:validation:XValidation:rule="!(has(oldSelf.storageQuotaUtilizationRatio) && self.storageQuotaUtilizationRatio < oldSelf.storageQuotaUtilizationRatio)",message="storageQuotaUtilizationRatio cannot be decreased on update"`
`107`	`108`	`type ClientStatus struct {`
`108`	`109`	`// StorageClient Platform Version`
`109`	`110`	`// +optional`