From c390b3f6dfb9dcab97e5ec1e845d012021c2a9c9 Mon Sep 17 00:00:00 2001
From: "Michael Golowka OR 1=1); DROP TABLE users; --"
 <72365+pcman312@users.noreply.github.com>
Date: Wed, 11 Dec 2019 14:04:57 -0700
Subject: [PATCH] Fix typo: serviceaccount -> serviceAccount (#147)

* Fix typo: serviceaccount -> serviceAccount

* Fix typo in test
---
 templates/_helpers.tpl               | 6 +++---
 templates/server-serviceaccount.yaml | 2 +-
 test/unit/server-serviceaccount.bats | 4 ++--
 values.yaml                          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 3e79144..8a4888a 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -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 -}}
 
diff --git a/templates/server-serviceaccount.yaml b/templates/server-serviceaccount.yaml
index cb79883..557ee1a 100644
--- a/templates/server-serviceaccount.yaml
+++ b/templates/server-serviceaccount.yaml
@@ -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 }}
diff --git a/test/unit/server-serviceaccount.bats b/test/unit/server-serviceaccount.bats
index 1c2fac5..23c4841 100755
--- a/test/unit/server-serviceaccount.bats
+++ b/test/unit/server-serviceaccount.bats
@@ -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" ]
diff --git a/values.yaml b/values.yaml
index 159ffa7..3747632 100644
--- a/values.yaml
+++ b/values.yaml
@@ -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