summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-10-29 15:51:58 +0200
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-11-08 16:15:22 +0000
commit04352ee80d9b3c0813e408298de031687d57a780 (patch)
tree6687de5c72f8a35dea32fd90061b4ded3cc36ac1
parentd975abe4947c7ee2a527a029656c68491e357ecb (diff)
[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)
-rw-r--r--kubernetes/common/etcd/templates/statefulset.yaml2
-rw-r--r--kubernetes/common/etcd/values.yaml1
2 files changed, 2 insertions, 1 deletions
diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index c8c0ffa0b2..ff11da309a 100644
--- 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 3cfd4535f1..e2334eadfe 100644
--- a/kubernetes/common/etcd/values.yaml
+++ b/kubernetes/common/etcd/values.yaml
@@ -17,6 +17,7 @@
#################################################################
global:
nodePortPrefix: 302
+ clusterName: cluster.local
persistence: {}
#################################################################