Skip to content

Fix server-certs volume condition #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Marcel-Jansen wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix server-certs volume condition #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4f9eaf
Create server-certs volume for httpsConnector or httpdSidecar
Marcel-Jansen Aug 12, 2024
a9cf24f
https fixes
Marcel-Jansen Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/gxf/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/gxf/config/tomcat/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 7 additions & 2 deletions charts/gxf/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/gxf/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down