From f13654dbce8dbb860163d281b57ce3c27f231f15 Mon Sep 17 00:00:00 2001
From: turtled <turtled@emqtt.io>
Date: Tue, 17 Apr 2018 11:39:03 +0800
Subject: [PATCH] Support set k8s namespace

---
 etc/emq.conf    | 6 ++++++
 priv/emq.schema | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/etc/emq.conf b/etc/emq.conf
index 3bcadfaf8..f296b8ff9 100644
--- a/etc/emq.conf
+++ b/etc/emq.conf
@@ -135,6 +135,12 @@ cluster.autoclean = 5m
 ## Value: String
 ## cluster.k8s.app_name = emq
 
+## Kubernates Namespace
+##
+## Value: String
+## cluster.k8s.namespace = default
+
+
 ##--------------------------------------------------------------------
 ## Node Args
 ##--------------------------------------------------------------------
diff --git a/priv/emq.schema b/priv/emq.schema
index 85eb16272..a06d838ed 100644
--- a/priv/emq.schema
+++ b/priv/emq.schema
@@ -124,6 +124,10 @@
   {datatype, string}
 ]}.
 
+{mapping, "cluster.k8s.namespace", "ekka.cluster_discovery", [
+  {datatype, string}
+]}.
+
 {translation, "ekka.cluster_discovery", fun(Conf) ->
   Strategy = cuttlefish:conf_get("cluster.discovery", Conf),
   Filter  = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end,
@@ -152,7 +156,8 @@
                  [{apiserver, cuttlefish:conf_get("cluster.k8s.apiserver", Conf)},
                   {service_name, cuttlefish:conf_get("cluster.k8s.service_name", Conf)},
                   {address_type, cuttlefish:conf_get("cluster.k8s.address_type", Conf, ip)},
-                  {app_name, cuttlefish:conf_get("cluster.k8s.app_name", Conf)}];
+                  {app_name, cuttlefish:conf_get("cluster.k8s.app_name", Conf)},
+                  {namespace, cuttlefish:conf_get("cluster.k8s.namespace", Conf)}];
                (manual) ->
                  [ ]
             end,