ODF info CM: exporting client info

Signed-off-by: raaizik <[email protected]>
red-hat-storage · Mar 13, 2024 · e50b002 · e50b002
1 parent 35ac7ee
commit e50b002
Show file tree

Hide file tree

Showing 11 changed files with 225 additions and 149 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,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

diff --git a/deploy/ocs-operator/manifests/storageconsumer.crd.yaml b/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

diff --git a/services/provider/interfaces/interfaces.go b/services/provider/interfaces/interfaces.go
@@ -16,8 +16,12 @@ type StorageClientOnboarding interface {
 	GetOnboardingTicket() string
 	GetConsumerName() string
 	GetClientOperatorVersion() string
+	GetClusterId() string
+	GetNamespacedName() string
 
 	SetOnboardingTicket(string) StorageClientOnboarding
 	SetConsumerName(string) StorageClientOnboarding
 	SetClientOperatorVersion(string) StorageClientOnboarding
+	SetClusterID(string) StorageClientOnboarding
+	SetNamespacedName(string) StorageClientOnboarding
 }
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
@@ -42,3 +42,13 @@ func (o *OnboardConsumerRequest) SetClientOperatorVersion(version string) ifaces
 	o.ClientOperatorVersion = version
 	return o
 }
+
+func (o *OnboardConsumerRequest) SetClusterID(clusterID string) ifaces.StorageClientOnboarding {
+	o.ClusterId = clusterID
+	return o
+}
+
+func (o *OnboardConsumerRequest) SetNamespacedName(namespacedName string) ifaces.StorageClientOnboarding {
+	o.NamespacedName = namespacedName
+	return o
+}
diff --git a/services/provider/proto/provider.proto b/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;
+    // NamespacedName is the name and namespace of the StorageClient
+    string NamespacedName = 5;
 }
 
 // OnboardConsumerResponse holds the response for OnboardConsumer API request

diff --git a/services/provider/server/consumer.go b/services/provider/server/consumer.go
@@ -79,6 +79,8 @@ func (c *ocsConsumerManager) Create(ctx context.Context, onboard ifaces.StorageC
 		Status: ocsv1alpha1.StorageConsumerStatus{
 			Client: ocsv1alpha1.ClientStatus{
 				OperatorVersion: onboard.GetClientOperatorVersion(),
+				ClusterID:       onboard.GetClusterId(),
+				NamespacedName:  onboard.GetNamespacedName(),
 			},
 		},
 	}

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

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