diff --git a/charts/gxf/Chart.yaml b/charts/gxf/Chart.yaml index 352c211..9cab780 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.8.0' +version: '1.8.1' 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 index 8b4b9ed..85ba561 100644 --- 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 }} - diff --git a/charts/gxf/templates/deployment.yaml b/charts/gxf/templates/deployment.yaml index 8b499f1..d586a5e 100644 --- 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 }} @@ -211,7 +216,7 @@ spec: configMap: name: {{ .Release.Name }}-apache {{- end }} - {{- if .Values.httpsConnector.enabled }} + {{- if or .Values.httpsConnector.enabled .Values.httpdSidecar.enabled }} - name: server-certs secret: secretName: {{ .Release.Name }}.apache-server-certs diff --git a/charts/gxf/templates/service.yaml b/charts/gxf/templates/service.yaml index 3738e5a..c504fd7 100644 --- 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