Merge pull request #3 from Babbleshack/fix_serviceAccount_annotations

Fix: annotations for serviceAccount are rendered as labels
risingwavelabs · Oct 18, 2023 · 6ea0f70 · 6ea0f70
2 parents eef5e6c + a8ea106
commit 6ea0f70
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/charts/risingwave/templates/serviceaccount.yaml b/charts/risingwave/templates/serviceaccount.yaml
@@ -10,12 +10,14 @@ metadata:
   name: {{ include "risingwave.serviceAccountName" . }}
   labels:
     {{- include "risingwave.labels" . | nindent 4 }}
-  {{- $annotations := (include "risingwave.annotations" . ) | trim }}
-  {{- if $annotations }}
+  {{- if or (include "risingwave.annotations" .) .Values.serviceAccount.annotations }}
   annotations:
+    {{- $annotations := (include "risingwave.annotations" . ) | trim }}
+    {{- if $annotations }}
     {{ nindent 4 $annotations }}
-  {{- end }}
-  {{- with .Values.serviceAccount.annotations }}
+    {{- end }}
+    {{- with .Values.serviceAccount.annotations }}
     {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}
 {{- end }}