Merge pull request #2504 from raaizik/rdr-odfinfo-server

RDR: exporting client info
red-hat-storage · Mar 21, 2024 · 62071d9 · 62071d9
2 parents 8f94626 + 95dc675
commit 62071d9
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 62 deletions.
diff --git a/api/v1alpha1/storageconsumer_types.go b/api/v1alpha1/storageconsumer_types.go
@@ -72,6 +72,10 @@ type ClientStatus struct {
 	PlatformVersion string `json:"platformVersion"`
 	// StorageClient Operator Version
 	OperatorVersion string `json:"operatorVersion"`
+	// ClusterID is the id of the openshift cluster
+	ClusterID string `json:"clusterId"`
+	// NamespacedName is the name and namespace of the StorageClient
+	NamespacedName string `json:"namespacedName"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/config/crd/bases/ocs.openshift.io_storageconsumers.yaml b/config/crd/bases/ocs.openshift.io_storageconsumers.yaml
@@ -69,13 +69,21 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clusterId:
+                    description: ClusterID is the id of the openshift cluster
+                    type: string
+                  namespacedName:
+                    description: NamespacedName is the name and namespace of the StorageClient
+                    type: string
                   operatorVersion:
                     description: StorageClient Operator Version
                     type: string
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
                 required:
+                - clusterId
+                - namespacedName
                 - operatorVersion
                 - platformVersion
                 type: object

diff --git a/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml b/deploy/csv-templates/crds/ocs/ocs.openshift.io_storageconsumers.yaml
@@ -69,13 +69,21 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clusterId:
+                    description: ClusterID is the id of the openshift cluster
+                    type: string
+                  namespacedName:
+                    description: NamespacedName is the name and namespace of the StorageClient
+                    type: string
                   operatorVersion:
                     description: StorageClient Operator Version
                     type: string
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
                 required:
+                - clusterId
+                - namespacedName
                 - operatorVersion
                 - platformVersion
                 type: object

diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/deploy/ocs-operator/manifests/storageconsumer.crd.yaml
@@ -68,13 +68,21 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clusterId:
+                    description: ClusterID is the id of the openshift cluster
+                    type: string
+                  namespacedName:
+                    description: NamespacedName is the name and namespace of the StorageClient
+                    type: string
                   operatorVersion:
                     description: StorageClient Operator Version
                     type: string
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
                 required:
+                - clusterId
+                - namespacedName
                 - operatorVersion
                 - platformVersion
                 type: object

diff --git a/services/provider/interfaces/interfaces.go b/services/provider/interfaces/interfaces.go
@@ -6,9 +6,13 @@ type StorageClientStatus interface {
 	// no client is using it
 	GetPlatformVersion() string
 	GetOperatorVersion() string
+	GetClusterID() string
+	GetNamespacedName() string
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
+	SetClusterID(string) StorageClientStatus
+	SetNamespacedName(string) StorageClientStatus
 }
 
 type StorageClientOnboarding interface {

diff --git a/services/provider/pb/provider.pb.go b/services/provider/pb/provider.pb.go
diff --git a/services/provider/pb/storageclient.go b/services/provider/pb/storageclient.go
@@ -25,6 +25,16 @@ func (r *ReportStatusRequest) SetOperatorVersion(version string) ifaces.StorageC
 	return r
 }
 
+func (r *ReportStatusRequest) SetClusterID(clusterID string) ifaces.StorageClientStatus {
+	r.ClusterID = clusterID
+	return r
+}
+
+func (r *ReportStatusRequest) SetNamespacedName(namespacedName string) ifaces.StorageClientStatus {
+	r.NamespacedName = namespacedName
+	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
@@ -159,6 +159,10 @@ message ReportStatusRequest{
     string storageConsumerUUID = 1;
     string clientPlatformVersion = 2;
     string clientOperatorVersion = 3;
+    // clusterID is the id of the openshift cluster
+    string clusterID = 4;
+    // NamespacedName is the name and namespace of the StorageClient
+    string NamespacedName = 5;
 }
 
 message ReportStatusResponse{

diff --git a/services/provider/server/consumer.go b/services/provider/server/consumer.go
@@ -215,6 +215,8 @@ func (c *ocsConsumerManager) UpdateConsumerStatus(ctx context.Context, id string
 	consumerObj.Status.LastHeartbeat = metav1.Now()
 	consumerObj.Status.Client.PlatformVersion = status.GetPlatformVersion()
 	consumerObj.Status.Client.OperatorVersion = status.GetOperatorVersion()
+	consumerObj.Status.Client.ClusterID = status.GetClusterID()
+	consumerObj.Status.Client.NamespacedName = status.GetNamespacedName()
 
 	if err := c.client.Status().Update(ctx, consumerObj); err != nil {
 		return fmt.Errorf("Failed to patch Status for StorageConsumer %v: %v", consumerObj.Name, err)