Improved https connector config (#125)

Signed-off-by: Marcel Jansen <[email protected]>
OSGP · Mar 5, 2024 · 32e0a2f · 32e0a2f
1 parent f976ec9
commit 32e0a2f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 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.38'
+version: '1.5.39'
 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/config/tomcat/server.xml b/charts/gxf/config/tomcat/server.xml
@@ -54,8 +54,10 @@ SPDX-License-Identifier: Apache-2.0
             <Certificate certificateKeyFile="/etc/ssl/certs/server.key"
                          certificateKeyPassword="${CERTIFICATE_KEY_PASSWORD}"
                          certificateFile="/etc/ssl/certs/server.crt"
+                         {{- if .Values.httpsConnector.clientAuthEnabled }}
                          caCertificateFile="/etc/ssl/certs/root.crt"
-                         SSLVerifyClient="require"
+                         SSLVerifyClient={{ .Values.httpsConnector.SSLVerifyClient | default "optional" | quote }}
+                         {{- end }}
                          type="RSA" />
         </SSLHostConfig>
     </Connector>

diff --git a/charts/gxf/templates/deployment.yaml b/charts/gxf/templates/deployment.yaml
@@ -59,8 +59,9 @@ spec:
         {{- if .Values.httpsConnector.enabled }}
         - name: CERTIFICATE_KEY_PASSWORD
           valueFrom:
-            secretKeyRef: {{ .Release.Name }}.apache-server-certs
-            key: server-key-password
+            secretKeyRef:
+              name: {{ .Release.Name }}.apache-server-certs
+              key: server-key-password
         {{- end }}
         {{- range $key, $value := .Values.extraEnv }}
         - name: {{ $key }}