From c6adb89d4b1aef68316fab990aef6a6a5e0548a4 Mon Sep 17 00:00:00 2001 From: StupidScience <32177073+StupidScience@users.noreply.github.com> Date: Sun, 6 Oct 2019 21:50:48 +0200 Subject: [PATCH] added possibility to add extraLabels for server pod (#59) --- templates/server-statefulset.yaml | 3 +++ test/unit/server-statefulset.bats | 13 +++++++++++++ values.yaml | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml index 3fe0b3d..6597a36 100644 --- a/templates/server-statefulset.yaml +++ b/templates/server-statefulset.yaml @@ -30,6 +30,9 @@ spec: app.kubernetes.io/name: {{ template "vault.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} component: server + {{- if .Values.server.extraLabels -}} + {{- toYaml .Values.server.extraLabels | nindent 8 -}} + {{- end -}} {{ template "vault.annotations" . }} spec: {{ template "vault.affinity" . }} diff --git a/test/unit/server-statefulset.bats b/test/unit/server-statefulset.bats index 6e34fc5..76f7a68 100755 --- a/test/unit/server-statefulset.bats +++ b/test/unit/server-statefulset.bats @@ -510,3 +510,16 @@ load _helpers yq -r '.spec.template.spec.nodeSelector' | tee /dev/stderr) [ "${actual}" = "testing" ] } + +#-------------------------------------------------------------------- +# extra labels + +@test "server/standalone-StatefulSet: specify extraLabels" { + cd `chart_dir` + local actual=$(helm template \ + -x templates/server-statefulset.yaml \ + --set 'server.extraLabels.foo=bar' \ + . | tee /dev/stderr | + yq -r '.spec.template.metadata.labels.foo' | tee /dev/stderr) + [ "${actual}" = "bar" ] +} diff --git a/values.yaml b/values.yaml index cb4d4d6..65530d0 100644 --- a/values.yaml +++ b/values.yaml @@ -95,6 +95,11 @@ server: # beta.kubernetes.io/arch: amd64 nodeSelector: {} + # Extra labels to attach to the server pods + # This should be a multi-line string mapping directly to the a map of + # the labels to apply to the server pods + extraLabels: {} + # Extra annotations to attach to the server pods # This should be a multi-line string mapping directly to the a map of # the annotations to apply to the server pods