Syncing latest changes from main for ocs-operator

api/v1alpha1/storageconsumer_types.go

@@ -90,6 +90,10 @@ type ClientStatus struct {
 	// Name is the name of connected storageclient
 	// +optional
 	Name string `json:"name,omitempty"`
+
+	// StorageQuotaUtilizationRatio is the ratio of utilized quota of connected client
+	// +optional
+	StorageQuotaUtilizationRatio float32 `json:"storageQuotaUtilizationRatio,omitempty"`
 }
 
 //+kubebuilder:object:root=true

config/crd/bases/ocs.openshift.io_storageconsumers.yaml

@@ -91,6 +91,10 @@ spec:
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
+                  storageQuotaUtilizationRatio:
+                    description: StorageQuotaUtilizationRatio is the ratio of utilized
+                      quota of connected client
+                    type: number
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml

@@ -91,6 +91,10 @@ spec:
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
+                  storageQuotaUtilizationRatio:
+                    description: StorageQuotaUtilizationRatio is the ratio of utilized
+                      quota of connected client
+                    type: number
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

deploy/ocs-operator/manifests/storageconsumer.crd.yaml

@@ -91,6 +91,10 @@ spec:
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
+                  storageQuotaUtilizationRatio:
+                    description: StorageQuotaUtilizationRatio is the ratio of utilized
+                      quota of connected client
+                    type: number
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

services/provider/api/interfaces/interfaces.go

@@ -9,12 +9,14 @@ type StorageClientStatus interface {
 	GetClusterID() string
 	GetClusterName() string
 	GetClientName() string
+	GetStorageQuotaUtilizationRatio() float32
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
 	SetClusterID(string) StorageClientStatus
 	SetClusterName(string) StorageClientStatus
 	SetClientName(string) StorageClientStatus
+	SetStorageQuotaUtilizationRatio(float32) StorageClientStatus
 }
 
 type StorageClientOnboarding interface {

services/provider/api/storageclient.go

@@ -40,6 +40,11 @@ func (r *ReportStatusRequest) SetClusterName(clusterName string) ifaces.StorageC
 	return r
 }
 
+func (r *ReportStatusRequest) SetStorageQuotaUtilizationRatio(storageQuotaUtilizationRatio float32) ifaces.StorageClientStatus {
+	r.StorageQuotaUtilizationRatio = storageQuotaUtilizationRatio
+	return r
+}
+
 // ensure OnboardConsumerRequest satisfies StorageClientOnboarding interface
 var _ ifaces.StorageClientOnboarding = &OnboardConsumerRequest{}
 

services/provider/proto/provider.proto

@@ -171,6 +171,8 @@ message ReportStatusRequest{
     string clusterName = 5;
     // clientName is the name of the connected storageclient
     string clientName = 6;
+    // storageQuotaUtilizationRatio is the ratio of utilized quota of connected client
+    float storageQuotaUtilizationRatio = 7;
 
 }
 

services/provider/server/consumer.go

@@ -219,6 +219,7 @@ func (c *ocsConsumerManager) UpdateConsumerStatus(ctx context.Context, id string
 	consumerObj.Status.Client.ClusterID = status.GetClusterID()
 	consumerObj.Status.Client.Name = status.GetClientName()
 	consumerObj.Status.Client.ClusterName = status.GetClusterName()
+	consumerObj.Status.Client.StorageQuotaUtilizationRatio = status.GetStorageQuotaUtilizationRatio()
 
 	if err := c.client.Status().Update(ctx, consumerObj); err != nil {
 		return fmt.Errorf("Failed to patch Status for StorageConsumer %v: %v", consumerObj.Name, err)