From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 12 Oct 2018 12:44:12 +0000 (+0200)
Subject: mgr/rook: Fix cluster name detection
X-Git-Tag: v14.0.1~44^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d66afa918fad97f637297fd9ada044d5b5e385fb;p=ceph.git

mgr/rook: Fix cluster name detection

`ROOK_CLUSTER_NAME` vanished from environment. Change to
'POD_NAMESPACE'.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index dafd1191aa8..87c5e87de49 100644
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -187,7 +187,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
     def available(self):
         if not kubernetes_imported:
             return False, "`kubernetes` module not found"
-        elif not self._in_cluster():
+        elif not self._in_cluster_name:
             return False, "ceph-mgr not running in Rook cluster"
 
         try:
@@ -219,23 +219,27 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
         self._initialized.wait()
         return self._rook_cluster
 
-    def _in_cluster(self):
+    @property
+    def _in_cluster_name(self):
         """
         Check if we appear to be running inside a Kubernetes/Rook
         cluster
 
-        :return: bool
+        :return: str
         """
-        return 'ROOK_CLUSTER_NAME' in os.environ
+        if 'POD_NAMESPACE' in os.environ:
+            return os.environ['POD_NAMESPACE']
+        if 'ROOK_CLUSTER_NAME' in os.environ:
+            return os.environ['ROOK_CLUSTER_NAME']
 
     def serve(self):
         # For deployed clusters, we should always be running inside
         # a Rook cluster.  For development convenience, also support
         # running outside (reading ~/.kube config)
 
-        if self._in_cluster():
+        if self._in_cluster_name:
             config.load_incluster_config()
-            cluster_name = os.environ['ROOK_CLUSTER_NAME']
+            cluster_name = self._in_cluster_name
         else:
             self.log.warning("DEVELOPMENT ONLY: Reading kube config from ~")
             config.load_kube_config()