fix

red-hat-storage · Mar 31, 2024 · 6f1d082 · 6f1d082
1 parent 1b474ae
commit 6f1d082
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/api/v1alpha1/storageconsumer_types.go b/api/v1alpha1/storageconsumer_types.go
@@ -74,10 +74,10 @@ type ClientStatus struct {
 	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"`
 	// ClusterName is the name of the openshift cluster
 	ClusterName string `json:"clusterName"`
+	// NamespacedName is the name and namespace of the StorageClient
+	NamespacedName string `json:"namespacedName"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/services/provider/interfaces/interfaces.go b/services/provider/interfaces/interfaces.go
@@ -7,14 +7,14 @@ type StorageClientStatus interface {
 	GetPlatformVersion() string
 	GetOperatorVersion() string
 	GetClusterID() string
-	GetNamespacedName() string
 	GetClusterName() string
+	GetNamespacedName() string
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
 	SetClusterID(string) StorageClientStatus
-	SetNamespacedName(string) StorageClientStatus
 	SetClusterName(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/proto/provider.proto b/services/provider/proto/provider.proto
@@ -161,10 +161,11 @@ message ReportStatusRequest{
     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;
     // clusterName is the name of the openshift cluster
-    string clusterName = 6;
+    string clusterName = 5;
+    // NamespacedName is the name and namespace of the StorageClient
+    string NamespacedName = 6;
+
 }
 
 message ReportStatusResponse{

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