yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add default k8s.suffix

This commit is contained in:
turtled 2019-07-19 10:36:32 +08:00 committed by Shawn
parent caf6dab808
commit 01f8ce1dc7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/emqx.conf
View File

@ -153,10 +153,10 @@ cluster.autoclean = 5m
## Value: String ## Value: String
## cluster.k8s.app_name = emqx ## cluster.k8s.app_name = emqx
## The suffix added to hostname get from k8s service, only valid if cluster.k8s.address_type set to hostname ## The suffix added to dns and hostname get from k8s service
## ##
## Value: String ## Value: String
## cluster.k8s.hostname_suffix = ## cluster.k8s.suffix = pod.cluster.local
## Kubernates Namespace ## Kubernates Namespace
## ##

4
priv/emqx.schema
View File

@ -140,7 +140,7 @@
{datatype, string} {datatype, string}
]}. ]}.
{mapping, "cluster.k8s.hostname_suffix", "ekka.cluster_discovery", [ {mapping, "cluster.k8s.suffix", "ekka.cluster_discovery", [
{datatype, string}, {datatype, string},
{default, ""} {default, ""}
]}. ]}.
@ -182,7 +182,7 @@
{address_type, cuttlefish:conf_get("cluster.k8s.address_type", Conf, ip)}, {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)}, {namespace, cuttlefish:conf_get("cluster.k8s.namespace", Conf)},
{hostname_suffix, cuttlefish:conf_get("cluster.k8s.hostname_suffix", Conf, "")}]; {suffix, cuttlefish:conf_get("cluster.k8s.suffix", Conf, "")}];
(manual) -> (manual) ->
[ ] [ ]
end, end,