Merge pull request #119 from OSGP/serviceaccount-specific-labels-and-…

…annotations Make labels and annotations serviceaccount specific
OSGP · Nov 27, 2023 · ff6a9a2 · ff6a9a2
2 parents aabf7c0 + 61e77bc
commit ff6a9a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/charts/gxf/Chart.yaml b/charts/gxf/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: gxf
 description: Generic GXF Helm chart
-version: '1.5.32'
+version: '1.5.33'
 icon: https://artwork.lfenergy.org/projects/grid-exchange-fabric/abbrev/color/grid-exchange-fabric-abbrev-color.png
 maintainers:
   - name: OSGP

diff --git a/charts/gxf/templates/serviceaccount.yaml b/charts/gxf/templates/serviceaccount.yaml
@@ -9,11 +9,11 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-    {{- with .Values.labels }}
-    {{- toYaml . | nindent 4 }}
+    {{- with .Values.serviceAccount.labels }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
     {{- end }}
   annotations:
-    {{- with .Values.annotations }}
-    {{- toYaml . | nindent 4 }}
+    {{- with .Values.serviceAccount.annotations }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
     {{- end }}
 {{- end }}