Fix typo: serviceaccount -> serviceAccount (#147)

* Fix typo: serviceaccount -> serviceAccount

* Fix typo in test
This commit is contained in:
Michael Golowka OR 1=1); DROP TABLE users; -- 2019-12-11 14:04:57 -07:00 committed by Jason O'Donnell
parent e1ecb0d8ad
commit c390b3f6df
4 changed files with 8 additions and 8 deletions

View file

@ -250,10 +250,10 @@ Sets extra ui service annotations
{{/*
Sets extra service account annotations
*/}}
{{- define "vault.serviceaccount.annotations" -}}
{{- if and (ne .mode "dev") .Values.server.serviceaccount.annotations }}
{{- define "vault.serviceAccount.annotations" -}}
{{- if and (ne .mode "dev") .Values.server.serviceAccount.annotations }}
annotations:
{{- toYaml .Values.server.serviceaccount.annotations | nindent 4 }}
{{- toYaml .Values.server.serviceAccount.annotations | nindent 4 }}
{{- end }}
{{- end -}}

View file

@ -10,5 +10,5 @@ metadata:
app.kubernetes.io/name: {{ include "vault.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{ template "vault.serviceaccount.annotations" . }}
{{ template "vault.serviceAccount.annotations" . }}
{{ end }}

View file

@ -7,7 +7,7 @@ load _helpers
local actual=$(helm template \
-x templates/server-serviceaccount.yaml \
--set 'server.dev.enabled=true' \
--set 'server.serviceaccount.annotations.foo=bar' \
--set 'server.serviceAccount.annotations.foo=bar' \
. | tee /dev/stderr |
yq -r '.metadata.annotations["foo"]' | tee /dev/stderr)
[ "${actual}" = "null" ]
@ -15,7 +15,7 @@ load _helpers
local actual=$(helm template \
-x templates/server-serviceaccount.yaml \
--set 'server.ha.enabled=true' \
--set 'server.serviceaccount.annotations.foo=bar' \
--set 'server.serviceAccount.annotations.foo=bar' \
. | tee /dev/stderr |
yq -r '.metadata.annotations["foo"]' | tee /dev/stderr)
[ "${actual}" = "bar" ]

View file

@ -258,8 +258,8 @@ server:
# replicas. If you'd like a custom value, you can specify an override here.
maxUnavailable: null
# Definition of the serviceaccount used to run Vault.
serviceaccount:
# Definition of the serviceAccount used to run Vault.
serviceAccount:
annotations: {}
# Vault UI