From b39dadd5302774dddcaf50adfcfe548b907a74ff Mon Sep 17 00:00:00 2001 From: juan131 Date: Tue, 19 Nov 2019 11:07:30 +0100 Subject: [PATCH] [bitnami/consul] Fix 'retry-join-address' setup Signed-off-by: juan131 --- bitnami/consul/Chart.yaml | 2 +- bitnami/consul/templates/statefulset.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bitnami/consul/Chart.yaml b/bitnami/consul/Chart.yaml index 960e469c0..58d815fc9 100644 --- a/bitnami/consul/Chart.yaml +++ b/bitnami/consul/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: consul -version: 6.0.9 +version: 6.0.10 appVersion: 1.6.1 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy. home: https://www.consul.io/ diff --git a/bitnami/consul/templates/statefulset.yaml b/bitnami/consul/templates/statefulset.yaml index dbbf02195..4efdfddf0 100644 --- a/bitnami/consul/templates/statefulset.yaml +++ b/bitnami/consul/templates/statefulset.yaml @@ -86,10 +86,13 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} {{- end }} env: + {{- $consulFullName := include "consul.fullname" . }} + {{- $consulHeadlessSvcName := include "consul.fullname" . }} + {{- $clusterDomain := .Values.clusterDomain }} - name: BITNAMI_DEBUG value: {{ ternary "true" "false" .Values.image.debug | quote }} - name: CONSUL_RETRY_JOIN - value: "{{ template "consul.fullname" . }}-0.{{ template "consul.fullname" . }}.{{ .Release.Namespace }}.svc" + value: {{ printf "%s-0.%s.%s.svc.%s" $consulFullName $consulHeadlessSvcName .Release.Namespace $clusterDomain | quote }} - name: CONSUL_DISABLE_KEYRING_FILE value: "true" - name: CONSUL_BOOTSTRAP_EXPECT