Merge pull request #133 from OSGP/update-certs-path

Updating path to certs directory;Failure on UpgradeProtocol when usin…
OSGP · Dec 23, 2024 · 0089ebc · 0089ebc
2 parents e431dde + fbcda4d
commit 0089ebc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: 3.7
+          python-version: 3.11
 
       - name: Set up chart-testing
         uses: helm/[email protected]

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.8.3'
+version: '1.8.4'
 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
@@ -47,15 +47,15 @@ SPDX-License-Identifier: Apache-2.0
                secretRequired="false" />
     {{- end }}
     {{- if and .Values.httpsConnector.enabled (not .Values.httpdSidecar.enabled) }}
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
                maxThreads="{{ $maxThreads }}" SSLEnabled="true" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>
-            <Certificate certificateKeyFile="/etc/ssl/certs/server.key"
+            <Certificate certificateKeyFile="/certs/server.key"
                          certificateKeyPassword="${CERTIFICATE_KEY_PASSWORD}"
-                         certificateFile="/etc/ssl/certs/server.crt"
+                         certificateFile="/certs/server.crt"
                          {{- if .Values.httpsConnector.clientAuthEnabled }}
-                         caCertificateFile="/etc/ssl/certs/root.crt"
+                         caCertificateFile="/certs/root.crt"
                          SSLVerifyClient={{ .Values.httpsConnector.SSLVerifyClient | default "optional" | quote }}
                          {{- end }}
                          type="RSA" />

diff --git a/charts/gxf/templates/deployment.yaml b/charts/gxf/templates/deployment.yaml
@@ -92,6 +92,11 @@ spec:
             name: http
             protocol: TCP
         {{- end }}
+        {{- if .Values.httpsConnector.enabled }}
+          - containerPort: 8443
+            name: https
+            protocol: TCP
+        {{- end }}
         {{- range .Values.extraPorts }}
           - containerPort: {{ .port }}
             name: {{ .name }}

diff --git a/charts/gxf/templates/service.yaml b/charts/gxf/templates/service.yaml
@@ -12,6 +12,11 @@ spec:
       port: 443
       targetPort: https
     {{- end }}
+    {{- if .Values.httpsConnector.enabled }}
+    - name: https
+      port: 8443
+      targetPort: https
+    {{- end }}
     {{- range .Values.extraServicePorts }}
     - name: {{ $.Release.Name }}-{{ .name }}
       port: {{ .port }}