Adding usedCapacity for storage consumer api

Signed-off-by: rchikatw <[email protected]>
red-hat-storage · Oct 8, 2024 · 8c3ef57 · 8c3ef57
1 parent cfe597a
commit 8c3ef57
Show file tree

Hide file tree

Showing 14 changed files with 183 additions and 116 deletions.
diff --git a/api/v1alpha1/storageconsumer_types.go b/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 string `json:"storageQuotaUtilizationRatio,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/crd/bases/ocs.openshift.io_storageconsumers.yaml b/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: string
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml b/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: string
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/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: string
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

diff --git a/...s/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go b/...s/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go
diff --git a/services/provider/api/interfaces/interfaces.go b/services/provider/api/interfaces/interfaces.go
@@ -9,12 +9,14 @@ type StorageClientStatus interface {
 	GetClusterID() string
 	GetClusterName() string
 	GetClientName() string
+	GetStorageQuotaUtilizationRatio() string
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
 	SetClusterID(string) StorageClientStatus
 	SetClusterName(string) StorageClientStatus
 	SetClientName(string) StorageClientStatus
+	SetStorageQuotaUtilizationRatio(string) StorageClientStatus
 }
 
 type StorageClientOnboarding interface {

diff --git a/services/provider/api/provider.pb.go b/services/provider/api/provider.pb.go
diff --git a/services/provider/api/storageclient.go b/services/provider/api/storageclient.go
@@ -40,6 +40,11 @@ func (r *ReportStatusRequest) SetClusterName(clusterName string) ifaces.StorageC
 	return r
 }
 
+func (r *ReportStatusRequest) SetStorageQuotaUtilizationRatio(storageQuotaUtilizationRatio string) ifaces.StorageClientStatus {
+	r.StorageQuotaUtilizationRatio = storageQuotaUtilizationRatio
+	return r
+}
+
 // ensure OnboardConsumerRequest satisfies StorageClientOnboarding interface
 var _ ifaces.StorageClientOnboarding = &OnboardConsumerRequest{}
 

diff --git a/services/provider/proto/provider.proto b/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
+    string storageQuotaUtilizationRatio = 7;
 
 }
 

diff --git a/services/provider/server/consumer.go b/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)

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
diff --git a/...github.com/red-hat-storage/ocs-operator/services/provider/api/v4/interfaces/interfaces.go b/...github.com/red-hat-storage/ocs-operator/services/provider/api/v4/interfaces/interfaces.go