From e97f4a579f1bf44cc66d8295573bb01b7d1ff61f Mon Sep 17 00:00:00 2001
From: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com>
Date: Thu, 26 Mar 2020 17:19:26 -0400
Subject: [PATCH] Fix hardcoded service name in raft enfv (#240)

---
 templates/_helpers.tpl               |  2 +-
 test/unit/server-ha-statefulset.bats | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 866b826..9a22038 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -135,7 +135,7 @@ Set's additional environment variables based on the mode.
   {{ end }}
   {{ if and (eq .mode "ha") (eq (.Values.server.ha.raft.enabled | toString) "true") }}
             - name: VAULT_CLUSTER_ADDR
-              value: "https://$(HOSTNAME).vault-internal:8201"
+              value: "https://$(HOSTNAME).{{ template "vault.fullname" . }}-internal:8201"
   {{ end }}
 {{- end -}}
 
diff --git a/test/unit/server-ha-statefulset.bats b/test/unit/server-ha-statefulset.bats
index db2ea6b..8e19ae0 100755
--- a/test/unit/server-ha-statefulset.bats
+++ b/test/unit/server-ha-statefulset.bats
@@ -403,6 +403,28 @@ load _helpers
   [ "${actual}" = "secret_key_1" ]
 }
 
+
+#--------------------------------------------------------------------
+# VAULT_CLUSTER_ADDR renders
+
+@test "server/ha-StatefulSet: cluster addr renders" {
+  cd `chart_dir`
+  local object=$(helm template \
+      --show-only templates/server-statefulset.yaml  \
+      --set 'server.ha.enabled=true' \
+      --set 'server.ha.raft.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
+  
+  local actual=$(echo $object |
+     yq -r '.[7].name' | tee /dev/stderr)
+  [ "${actual}" = "VAULT_CLUSTER_ADDR" ]
+
+  local actual=$(echo $object |
+     yq -r '.[7].value' | tee /dev/stderr)
+  [ "${actual}" = 'https://$(HOSTNAME).RELEASE-NAME-vault-internal:8201' ]
+}
+
 #--------------------------------------------------------------------
 # storage class