Merge pull request #2891 from rewantsoni/clientID

client: use storageclient k8s id as the client id
red-hat-storage · Nov 13, 2024 · 201c936 · 201c936
2 parents 5bce897 + 484fae8
commit 201c936
Show file tree

Hide file tree

Showing 15 changed files with 207 additions and 149 deletions.
diff --git a/api/v1alpha1/storageconsumer_types.go b/api/v1alpha1/storageconsumer_types.go
@@ -94,6 +94,10 @@ type ClientStatus struct {
 	// StorageQuotaUtilizationRatio is the ratio of utilized quota of connected client
 	// +optional
 	StorageQuotaUtilizationRatio float64 `json:"storageQuotaUtilizationRatio,omitempty"`
+
+	// ID is the k8s UID of connected storageclient
+	// +optional
+	ID string `json:"clientId,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
@@ -76,6 +76,9 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clientId:
+                    description: ID is the k8s UID of connected storageclient
+                    type: string
                   clusterId:
                     description: ClusterID is the id of the openshift cluster
                     type: string

diff --git a/controllers/storagecluster/odfinfoconfig.go b/controllers/storagecluster/odfinfoconfig.go
@@ -177,7 +177,7 @@ func getConnectedClients(r *StorageClusterReconciler, storageCluster *ocsv1.Stor
 		newConnectedClient := ocsv1a1.ConnectedClient{
 			Name:      name,
 			ClusterID: clusterID,
-			ClientID:  string(storageConsumer.UID),
+			ClientID:  storageConsumer.Status.Client.ID,
 		}
 		connectedClients = append(connectedClients, newConnectedClient)
 	}

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml
@@ -76,6 +76,9 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clientId:
+                    description: ID is the k8s UID of connected storageclient
+                    type: string
                   clusterId:
                     description: ClusterID is the id of the openshift cluster
                     type: string

diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/deploy/ocs-operator/manifests/storageconsumer.crd.yaml
@@ -76,6 +76,9 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clientId:
+                    description: ID is the k8s UID of connected storageclient
+                    type: string
                   clusterId:
                     description: ClusterID is the id of the openshift cluster
                     type: string

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,13 +9,15 @@ type StorageClientStatus interface {
 	GetClusterID() string
 	GetClusterName() string
 	GetClientName() string
+	GetClientID() string
 	GetStorageQuotaUtilizationRatio() float64
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
 	SetClusterID(string) StorageClientStatus
 	SetClusterName(string) StorageClientStatus
 	SetClientName(string) StorageClientStatus
+	SetClientID(string) StorageClientStatus
 	SetStorageQuotaUtilizationRatio(float64) StorageClientStatus
 }
 

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) SetClientID(clientID string) ifaces.StorageClientStatus {
+	r.ClientID = clientID
+	return r
+}
+
 func (r *ReportStatusRequest) SetStorageQuotaUtilizationRatio(storageQuotaUtilizationRatio float64) ifaces.StorageClientStatus {
 	r.StorageQuotaUtilizationRatio = storageQuotaUtilizationRatio
 	return r

diff --git a/services/provider/proto/provider.proto b/services/provider/proto/provider.proto
@@ -178,6 +178,8 @@ message ReportStatusRequest{
     string clientName = 6;
     // storageQuotaUtilizationRatio is the ratio of utilized quota of connected client
     double storageQuotaUtilizationRatio = 7;
+    // clientID is the k8s UID of storageClient
+    string clientID = 8;
 
 }
 

diff --git a/services/provider/server/consumer.go b/services/provider/server/consumer.go
@@ -218,6 +218,7 @@ func (c *ocsConsumerManager) UpdateConsumerStatus(ctx context.Context, id string
 	consumerObj.Status.Client.OperatorVersion = status.GetOperatorVersion()
 	consumerObj.Status.Client.ClusterID = status.GetClusterID()
 	consumerObj.Status.Client.Name = status.GetClientName()
+	consumerObj.Status.Client.ID = status.GetClientID()
 	consumerObj.Status.Client.ClusterName = status.GetClusterName()
 	consumerObj.Status.Client.StorageQuotaUtilizationRatio = status.GetStorageQuotaUtilizationRatio()
 

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