Add extraArgs configurable (hashicorp#176)

huanwei · Jan 14, 2020 · ac2925d · ac2925d
1 parent 4ee82fd
commit ac2925d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -119,7 +119,7 @@ for users looking to use this chart with Consul Helm.
           - |
             sed -E "s/HOST_IP/${HOST_IP?}/g" /vault/config/extraconfig-from-values.hcl > /tmp/storageconfig.hcl;
             sed -Ei "s/POD_IP/${POD_IP?}/g" /tmp/storageconfig.hcl;
-            /usr/local/bin/docker-entrypoint.sh vault server -config=/tmp/storageconfig.hcl
+            /usr/local/bin/docker-entrypoint.sh vault server -config=/tmp/storageconfig.hcl {{ .Values.server.extraArgs }}
   {{ end }}
 {{- end -}}
 

diff --git a/test/unit/server-ingress.bats b/test/unit/server-ingress.bats
diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats
@@ -804,3 +804,13 @@ load _helpers
       yq -r '.spec.template.spec.containers[0].livenessProbe.initialDelaySeconds' | tee /dev/stderr)
   [ "${actual}" = "30" ]
 }
+
+@test "server/standalone-StatefulSet: add extraArgs" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -x templates/server-statefulset.yaml \
+      --set 'server.extraArgs=foobar' \
+      . | tee /dev/stderr |
+       yq -r '.spec.template.spec.containers[0].args[0]' | tee /dev/stderr)
+  [[ "${actual}" = *"foobar"* ]]
+}
diff --git a/values.yaml b/values.yaml
@@ -113,6 +113,8 @@ server:
   # extraContainers is a list of sidecar containers. Specified as a raw YAML string.
   extraContainers: null
 
+  # extraArgs is a string containing additional Vault server arguments.
+  extraArgs: ""
 
   # Used to define custom readinessProbe settings
   readinessProbe: