diff --git a/etc/emqx.conf b/etc/emqx.conf index da3ba53f5..df3be2a9a 100644 --- a/etc/emqx.conf +++ b/etc/emqx.conf @@ -153,10 +153,10 @@ cluster.autoclean = 5m ## Value: String ## 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 -## cluster.k8s.hostname_suffix = +## cluster.k8s.suffix = pod.cluster.local ## Kubernates Namespace ## diff --git a/priv/emqx.schema b/priv/emqx.schema index 6c54ac945..1d308476d 100644 --- a/priv/emqx.schema +++ b/priv/emqx.schema @@ -140,7 +140,7 @@ {datatype, string} ]}. -{mapping, "cluster.k8s.hostname_suffix", "ekka.cluster_discovery", [ +{mapping, "cluster.k8s.suffix", "ekka.cluster_discovery", [ {datatype, string}, {default, ""} ]}. @@ -182,7 +182,7 @@ {address_type, cuttlefish:conf_get("cluster.k8s.address_type", Conf, ip)}, {app_name, cuttlefish:conf_get("cluster.k8s.app_name", 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) -> [ ] end,