Skip to content

Commit

Permalink
ocs-to-ocs: list within namespace
Browse files Browse the repository at this point in the history
list storageConsumerList and node ip within namespace.

Closes: #1514
Signed-off-by: subhamkrai <srai@redhat.com>
  • Loading branch information
subhamkrai committed Feb 14, 2022
1 parent 2ada399 commit dfc86bd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions controllers/storagecluster/provider_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions services/provider/server/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down

0 comments on commit dfc86bd

Please sign in to comment.