diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 9e0a49f..0098ab1 100644 --- 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 old mode 100644 new mode 100755 diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats index cfbbc70..4ab9cb0 100755 --- 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 index 6bd986d..d632113 100644 --- 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: