From: Varsha Rao <varao@redhat.com>
Date: Thu, 12 Nov 2020 17:30:23 +0000 (+0530)
Subject: mgr/rook: Fix rook_cluster label value
X-Git-Tag: v16.1.0~351^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4daad2afde4bd54c1766ef29f348b8d2140ff673;p=ceph.git

mgr/rook: Fix rook_cluster label value

rook_cluster label value is cluster namespace instead of cluster name.

Signed-off-by: Varsha Rao <varao@redhat.com>
---

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index f6f8cdc717da..a417d31e73d7 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -197,7 +197,7 @@ class RookCluster(object):
         self.rook_pods = KubernetesResource(self.coreV1_api.list_namespaced_pod,
                                             namespace=self.rook_env.namespace,
                                             label_selector="rook_cluster={0}".format(
-                                                self.rook_env.cluster_name))
+                                                self.rook_env.namespace))
         self.nodes = KubernetesResource(self.coreV1_api.list_node)
 
     def rook_url(self, path):
@@ -284,7 +284,7 @@ class RookCluster(object):
                         rook_cluster=rook
         And MDS containers additionally have `rook_filesystem` label
 
-        Label filter is rook_cluster=<cluster name>
+        Label filter is rook_cluster=<cluster namespace>
                         rook_file_system=<self.fs_name>
         """
         def predicate(item):