From b0944d48dfa32a5c2b05012c4010af1c3f441559 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Mon, 19 Nov 2018 14:49:30 -0600
Subject: [PATCH] consolidate config-map

---
 templates/server-config-configmap.yaml    |  2 +-
 templates/server-ha-config-configmap.yaml | 15 ---------------
 templates/server-ha-statefulset.yaml      |  2 +-
 values.yaml                               |  8 ++++----
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 templates/server-ha-config-configmap.yaml

diff --git a/templates/server-config-configmap.yaml b/templates/server-config-configmap.yaml
index 35fcdc9..100880c 100644
--- a/templates/server-config-configmap.yaml
+++ b/templates/server-config-configmap.yaml
@@ -11,5 +11,5 @@ metadata:
     release: {{ .Release.Name }}
 data:
   statefulconfig-from-values.hcl: |-
-{{ tpl .Values.server.statefulConfig . | indent 4 }}
+{{ tpl .Values.server.config . | indent 4 }}
 {{- end }}
diff --git a/templates/server-ha-config-configmap.yaml b/templates/server-ha-config-configmap.yaml
deleted file mode 100644
index abc7235..0000000
--- a/templates/server-ha-config-configmap.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# StatefulSet to run the actual vault server cluster.
-{{- if (or (and (ne (.Values.consulHA.enabled | toString) "-") .Values.consulHA.enabled) (and (eq (.Values.consulHA.enabled | toString) "-") .Values.global.enabled)) }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "vault.fullname" . }}-ha-config
-  labels:
-    app: {{ template "vault.name" . }}
-    chart: {{ template "vault.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-data:
-  storageconfig-from-values.hcl: |-
-{{ tpl .Values.consulHA.storageConfig . | indent 4 }}
-{{- end }}
diff --git a/templates/server-ha-statefulset.yaml b/templates/server-ha-statefulset.yaml
index 7e50517..bae5d8c 100644
--- a/templates/server-ha-statefulset.yaml
+++ b/templates/server-ha-statefulset.yaml
@@ -39,7 +39,7 @@ spec:
       volumes:
         - name: config
           configMap:
-            name: {{ template "vault.fullname" . }}-ha-config
+            name: {{ template "vault.fullname" . }}-server-config
             defaultMode: 0755
         {{- range .Values.consulHA.extraVolumes }}
         - name: userconfig-{{ .name }}
diff --git a/values.yaml b/values.yaml
index 22d0434..d15f403 100644
--- a/values.yaml
+++ b/values.yaml
@@ -37,12 +37,12 @@ server:
   # By default no direct resource request is made.
   resources: {}
 
-  # statefulConfig is a raw string of default configuration when using a Stateful
+  # config is a raw string of default configuration when using a Stateful
   # deployment. Default is to use a PersistentVolumeClaim mounted at /vault/data
   # and store data there. This is only used when using a Replica count of 1, and
   # using a stateful set
   # This should be HCL
-  statefulConfig: |
+  config: |
     ui = true
     listener "tcp" {
       tls_disable = 1
@@ -77,12 +77,12 @@ consulHA:
   # By default no direct resource request is made.
   resources: {}
 
-  # statefulConfig is a raw string of default configuration when using a Stateful
+  # config is a raw string of default configuration when using a Stateful
   # deployment. Default is to use a PersistentVolumeClaim mounted at /vault/data
   # and store data there. This is only used when using a Replica count of 1, and
   # using a stateful set
   # This should be HCL
-  storageConfig: |
+  config: |
     ui = true
     listener "tcp" {
       tls_disable = 1