https fixes

OSGP · Aug 12, 2024 · a9cf24f · a9cf24f
1 parent a4f9eaf
commit a9cf24f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/charts/gxf/config/tomcat/server.xml b/charts/gxf/config/tomcat/server.xml
@@ -47,7 +47,7 @@ SPDX-License-Identifier: Apache-2.0
                secretRequired="false" />
     {{- end }}
     {{- if .Values.httpsConnector.enabled }}
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11Nio2Protocol"
                maxThreads="{{ $maxThreads }}" SSLEnabled="true" >
         <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
         <SSLHostConfig>

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 }}
@@ -112,7 +117,7 @@ spec:
           mountPath: /usr/local/bin
         {{- if .Values.httpsConnector.enabled }}
         - name: server-certs
-          mountPath: /certs
+          mountPath: /etc/ssl/certs
         {{- end }}
         {{- if .Values.extraVolumeMounts }}
         {{- toYaml .Values.extraVolumeMounts | nindent 8 }}

diff --git a/charts/gxf/templates/service.yaml b/charts/gxf/templates/service.yaml
@@ -7,7 +7,7 @@ spec:
     - name: http
       port: 80
       targetPort: http
-    {{- if .Values.httpdSidecar.enabled }}
+    {{- if or .Values.httpdSidecar.enabled .Values.httpsConnector.enabled }}
     - name: https
       port: 443
       targetPort: https