[ETCD] Give full FQDN name for etcd

Some Kubernetes deployments needs the full fqdn and not just the first
part in order to make etcd statefulset to work.

Issue-ID: OPTFRA-981
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Idf384d2c65b13f64885429181c4fa2eba5ac4282
(cherry picked from commit c991f0bf4291c7b79207d98e51ca4c4cd2a3fe72)

diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index c8c0ffa..ff11da3 100644 (file)
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -75,7 +75,7 @@ spec:
         - name: SET_NAME
           value: {{ include "common.fullname" . }}
         - name: SERVICE_NAME
-          value: {{ include "common.servicename" . }}
+          value: {{ include "common.servicename" . }}.{{ include "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
 {{- if .Values.extraEnv }}
 {{ toYaml .Values.extraEnv | indent 8 }}
 {{- end }}

diff --git a/kubernetes/common/etcd/values.yaml b/kubernetes/common/etcd/values.yaml
index 3cfd453..e2334ea 100644 (file)
--- a/kubernetes/common/etcd/values.yaml
+++ b/kubernetes/common/etcd/values.yaml
@@ -17,6 +17,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
+  clusterName: cluster.local
   persistence: {}
 
 #################################################################