Merge branch 'main' into httpd-security-improvements

OSGP · Jan 22, 2024 · 8e8ff59 · 8e8ff59
2 parents 3edf362 + 9439707
commit 8e8ff59
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -43,8 +43,8 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.22.17
-          - v1.24.6
+          - v1.26.11
+          - v1.28.4
     steps:
       - name: Checkout
         uses: actions/checkout@v1

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.31'
+version: '1.5.35'
 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/deployment.yaml b/charts/gxf/templates/deployment.yaml
@@ -64,7 +64,7 @@ spec:
         - name: {{ $key }}
           valueFrom:
             secretKeyRef:
-              name: {{ $value.secretName }}
+              name: {{ tpl $value.secretName $ }}
               key: {{ $value.secretKey }}
         {{- end }}
         ports:

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