Merge pull request #1516 from subhamkrai/fix-list-ocs-to-ocs

ocs-to-ocs: list within namespace
red-hat-storage · Feb 14, 2022 · cef8132 · cef8132
2 parents 4bf1763 + 6f0cd5f
commit cef8132
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/controllers/storagecluster/provider_server.go b/controllers/storagecluster/provider_server.go
@@ -172,7 +172,7 @@ func (o *ocsProviderServer) createService(r *StorageClusterReconciler, instance
 
 	r.Log.Info("Service create/update succeeded")
 
-	nodeAddresses, err := r.getWorkerNodesInternalIPAddresses()
+	nodeAddresses, err := r.getWorkerNodesInternalIPAddresses(desiredService.Namespace)
 	if err != nil {
 		return err
 	}
@@ -220,11 +220,11 @@ func (o *ocsProviderServer) ensureDeploymentReplica(actual, desired *appsv1.Depl
 }
 
 // getWorkerNodesInternalIPAddresses return slice of Internal IPAddress of worker nodes
-func (r *StorageClusterReconciler) getWorkerNodesInternalIPAddresses() ([]string, error) {
+func (r *StorageClusterReconciler) getWorkerNodesInternalIPAddresses(namespace string) ([]string, error) {
 
 	nodes := &corev1.NodeList{}
 
-	err := r.Client.List(context.TODO(), nodes)
+	err := r.Client.List(context.TODO(), nodes, client.InNamespace(namespace))
 	if err != nil {
 		r.Log.Error(err, "Failed to list nodes")
 		return nil, err

diff --git a/deploy/bundle/manifests/provider-role.yaml b/deploy/bundle/manifests/provider-role.yaml
@@ -11,6 +11,12 @@ rules:
   - services
   verbs:
   - get
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - list
 - apiGroups:
   - ocs.openshift.io
   resources:

diff --git a/rbac/provider-role.yaml b/rbac/provider-role.yaml
@@ -11,6 +11,12 @@ rules:
   - services
   verbs:
   - get
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - list
 - apiGroups:
   - ocs.openshift.io
   resources:

diff --git a/services/provider/server/consumer.go b/services/provider/server/consumer.go
@@ -27,9 +27,9 @@ type ocsConsumerManager struct {
 	mutex        sync.RWMutex
 }
 
-func newConsumerManager(ctx context.Context, client client.Client, namespace string) (*ocsConsumerManager, error) {
+func newConsumerManager(ctx context.Context, cl client.Client, namespace string) (*ocsConsumerManager, error) {
 	consumers := &ocsv1alpha1.StorageConsumerList{}
-	err := client.List(ctx, consumers)
+	err := cl.List(ctx, consumers, client.InNamespace(namespace))
 	if err != nil {
 		return nil, fmt.Errorf("failed to list storage consumers. %v", err)
 	}
@@ -46,7 +46,7 @@ func newConsumerManager(ctx context.Context, client client.Client, namespace str
 	}
 
 	return &ocsConsumerManager{
-		client:       client,
+		client:       cl,
 		namespace:    namespace,
 		nameByTicket: nameByTicket,
 		nameByUID:    nameByUID,