chore: address cr comments

Service account annotations are completely separated from other
annotations, for now at least.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

charts/kargo/templates/controller/service-account.yaml

@@ -7,10 +7,8 @@ metadata:
   labels:
     {{- include "kargo.labels" . | nindent 4 }}
     {{- include "kargo.controller.labels" . | nindent 4 }}
-  {{- with (mergeOverwrite (deepCopy .Values.global.annotations) .Values.controller.annotations) }}
+  {{- with .Values.controller.serviceAccount.annotations }}
   annotations:
-    {{- range $key, $value := . }}
-      {{ $key }}: {{ $value | quote }}
-      {{- end }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}

charts/kargo/values.yaml

@@ -337,6 +337,11 @@ controller:
   ## @param controller.podAnnotations Optional annotations to add to pods. Merges with `global.podAnnotations`, allowing you to override or add to the global annotations.
   podAnnotations: {}
 
+  ## All settings relating to the service account for the controller
+  serviceAccount:
+    ## @param controller.serviceAccount.annotations Optional annotations to add to the service account.
+    annotations: {}
+
   ## All settings relating to shared credentials (used across multiple kargo projects)
   globalCredentials:
     ## @param controller.globalCredentials.namespaces List of namespaces to look for shared credentials.