From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 31 Oct 2018 03:50:53 +0000 (-0700)
Subject: common/util.cc: add CONTAINER_NAME processing for metadata
X-Git-Tag: v14.1.0~724^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25383%2Fhead;p=ceph.git

common/util.cc: add CONTAINER_NAME processing for metadata

Kubernetes clusters use POD_NAME; simple containers should be
distinguishable and don't have 'pods'.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/common/util.cc b/src/common/util.cc
index d0fbee5e3fc06..68545840e7d79 100644
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -154,15 +154,24 @@ void collect_sys_info(map<string, string> *m, CephContext *cct)
   }
 
   // but wait, am i in a container?
+  bool in_container = false;
+
   if (const char *pod_name = getenv("POD_NAME")) {
     (*m)["pod_name"] = pod_name;
+    in_container = true;
+  }
+  if (const char *container_name = getenv("CONTAINER_NAME")) {
+    (*m)["container_name"] = container_name;
+    in_container = true;
+  }
+  if (in_container) {
     if (const char *node_name = getenv("NODE_NAME")) {
       (*m)["container_hostname"] = u.nodename;
       (*m)["hostname"] = node_name;
     }
-  }
-  if (const char *ns = getenv("POD_NAMESPACE")) {
-    (*m)["pod_namespace"] = ns;
+    if (const char *ns = getenv("POD_NAMESPACE")) {
+      (*m)["pod_namespace"] = ns;
+    }
   }
 
 #ifdef __APPLE__