From dd7fd589bbb862a7ec4d6d2a19edf1389ed87980 Mon Sep 17 00:00:00 2001
From: Marcel Jansen <34770714+Marcel-Jansen@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:56:40 +0100
Subject: [PATCH 1/3] Make labels and annotations serviceaccount specific

Signed-off-by: Marcel Jansen <34770714+Marcel-Jansen@users.noreply.github.com>
---
 charts/gxf/templates/serviceaccount.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/gxf/templates/serviceaccount.yaml b/charts/gxf/templates/serviceaccount.yaml
index 68ed750..e2e0111 100644
--- 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 }}
+    {{- with .Values.serviceAccount.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
-    {{- with .Values.annotations }}
+    {{- with .Values.serviceAccount.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- end }}

From 434adbb9d68b761d1d5e35d7b3fbb4e958b28ad7 Mon Sep 17 00:00:00 2001
From: Marcel Jansen <34770714+Marcel-Jansen@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:58:23 +0100
Subject: [PATCH 2/3] Bump chart version

Signed-off-by: Marcel Jansen <34770714+Marcel-Jansen@users.noreply.github.com>
---
 charts/gxf/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gxf/Chart.yaml b/charts/gxf/Chart.yaml
index 2a1a843..81fddcf 100644
--- 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

From 61e77bc38f1a00cdaa34572cb8da2abbe74a71cf Mon Sep 17 00:00:00 2001
From: Marcel Jansen <34770714+Marcel-Jansen@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:14:09 +0100
Subject: [PATCH 3/3] Add tpl function

Signed-off-by: Marcel Jansen <34770714+Marcel-Jansen@users.noreply.github.com>
---
 charts/gxf/templates/serviceaccount.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/gxf/templates/serviceaccount.yaml b/charts/gxf/templates/serviceaccount.yaml
index e2e0111..b8532ee 100644
--- a/charts/gxf/templates/serviceaccount.yaml
+++ b/charts/gxf/templates/serviceaccount.yaml
@@ -10,10 +10,10 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
     {{- with .Values.serviceAccount.labels }}
-    {{- toYaml . | nindent 4 }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
     {{- end }}
   annotations:
     {{- with .Values.serviceAccount.annotations }}
-    {{- toYaml . | nindent 4 }}
+    {{- tpl (toYaml .) $ | nindent 4 }}
     {{- end }}
 {{- end }}