ODF info CM: exporting client info

Signed-off-by: raaizik <[email protected]>

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"`
+	// StorageClientNamespacedName is the name and namespace of the StorageClient
+	StorageClientNamespacedName string `json:"storageClientNamespacedName"`
 }
 
 //+kubebuilder:object:root=true

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

@@ -69,15 +69,24 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clusterId:
+                    description: ClusterID is the id of the openshift cluster
+                    type: string
                   operatorVersion:
                     description: StorageClient Operator Version
                     type: string
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
+                  storageClientNamespacedName:
+                    description: StorageClientNamespacedName is the name and namespace
+                      of the StorageClient
+                    type: string
                 required:
+                - clusterId
                 - operatorVersion
                 - platformVersion
+                - storageClientNamespacedName
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

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

@@ -69,15 +69,24 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clusterId:
+                    description: ClusterID is the id of the openshift cluster
+                    type: string
                   operatorVersion:
                     description: StorageClient Operator Version
                     type: string
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
+                  storageClientNamespacedName:
+                    description: StorageClientNamespacedName is the name and namespace
+                      of the StorageClient
+                    type: string
                 required:
+                - clusterId
                 - operatorVersion
                 - platformVersion
+                - storageClientNamespacedName
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

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

@@ -68,15 +68,24 @@ spec:
               client:
                 description: Information of storage client received from consumer
                 properties:
+                  clusterId:
+                    description: ClusterID is the id of the openshift cluster
+                    type: string
                   operatorVersion:
                     description: StorageClient Operator Version
                     type: string
                   platformVersion:
                     description: StorageClient Platform Version
                     type: string
+                  storageClientNamespacedName:
+                    description: StorageClientNamespacedName is the name and namespace
+                      of the StorageClient
+                    type: string
                 required:
+                - clusterId
                 - operatorVersion
                 - platformVersion
+                - storageClientNamespacedName
                 type: object
               lastHeartbeat:
                 description: Timestamp of last heartbeat received from consumer

services/provider/interfaces/interfaces.go

@@ -6,6 +6,8 @@ type StorageClientStatus interface {
 	// no client is using it
 	GetPlatformVersion() string
 	GetOperatorVersion() string
+	GetClusterId() string
+	GetStorageClientNamespacedName() string
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
@@ -16,6 +18,8 @@ type StorageClientOnboarding interface {
 	GetOnboardingTicket() string
 	GetConsumerName() string
 	GetClientOperatorVersion() string
+	GetClusterId() string
+	GetStorageClientNamespacedName() string
 
 	SetOnboardingTicket(string) StorageClientOnboarding
 	SetConsumerName(string) StorageClientOnboarding

services/provider/proto/provider.proto

@@ -49,6 +49,10 @@ message OnboardConsumerRequest{
     string consumerName = 2;
     // clientOperatorVersion is the semver version of ocs-client-operator
     string clientOperatorVersion = 3;
+    // clusterID is the id of the openshift cluster
+    string clusterId = 4;
+    // storageClientNamespacedName is the name and namespace of the StorageClient
+    string storageClientNamespacedName = 5;
 }
 
 // OnboardConsumerResponse holds the response for OnboardConsumer API request
@@ -159,6 +163,8 @@ message ReportStatusRequest{
     string storageConsumerUUID = 1;
     string clientPlatformVersion = 2;
     string clientOperatorVersion = 3;
+    string clusterId = 4;
+    string storageClientNamespacedName = 5;
 }
 
 message ReportStatusResponse{}

services/provider/server/consumer.go

@@ -78,7 +78,9 @@ func (c *ocsConsumerManager) Create(ctx context.Context, onboard ifaces.StorageC
 		},
 		Status: ocsv1alpha1.StorageConsumerStatus{
 			Client: ocsv1alpha1.ClientStatus{
-				OperatorVersion: onboard.GetClientOperatorVersion(),
+				OperatorVersion:             onboard.GetClientOperatorVersion(),
+				ClusterID:                   onboard.GetClusterId(),
+				StorageClientNamespacedName: onboard.GetStorageClientNamespacedName(),
 			},
 		},
 	}
@@ -215,6 +217,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.StorageClientNamespacedName = status.GetStorageClientNamespacedName()
 
 	if err := c.client.Status().Update(ctx, consumerObj); err != nil {
 		return fmt.Errorf("Failed to patch Status for StorageConsumer %v: %v", consumerObj.Name, err)

services/provider/server/server.go

@@ -115,16 +115,16 @@ func (s *OCSProviderServer) OnboardConsumer(ctx context.Context, req *pb.Onboard
 			return nil, status.Errorf(codes.Internal, "failed to create storageConsumer %q. %v", req.ConsumerName, err)
 		}
 
-		stoageConsumer, err := s.consumerManager.GetByName(ctx, req.ConsumerName)
+		storageConsumer, err := s.consumerManager.GetByName(ctx, req.ConsumerName)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "Failed to get storageConsumer. %v", err)
 		}
 
-		if stoageConsumer.Spec.Enable {
+		if storageConsumer.Spec.Enable {
 			err = fmt.Errorf("storageconsumers.ocs.openshift.io %s already exists", req.ConsumerName)
 			return nil, status.Errorf(codes.AlreadyExists, "failed to create storageConsumer %q. %v", req.ConsumerName, err)
 		}
-		storageConsumerUUID = string(stoageConsumer.UID)
+		storageConsumerUUID = string(storageConsumer.UID)
 	}
 
 	return &pb.OnboardConsumerResponse{StorageConsumerUUID: storageConsumerUUID}, nil