Skip to content

Updating path to certs directory;Failure on UpgradeProtocol when usin… #133

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

Merged
dj-wasabi merged 5 commits into from
Dec 23, 2024
Merged

Updating path to certs directory;Failure on UpgradeProtocol when usin… #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11d2f55
Updating path to certs directory;Failure on UpgradeProtocol when usin…
dj-wasabi Dec 19, 2024
a4ce1d1
Updating chart version to newer semver
dj-wasabi Dec 19, 2024
f2e9c69
Updating to newer/allowed Python version as part of the CI test
dj-wasabi Dec 19, 2024
1677a8d
Added missing port for tls
dj-wasabi Dec 19, 2024
fbcda4d
Changing paths back to /certs to not override system wide certificaties
dj-wasabi Dec 20, 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 .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/chart-testing-action@v2.1.0
Expand Down
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.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
Expand Down
8 changes: 4 additions & 4 deletions charts/gxf/config/tomcat/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
5 changes: 5 additions & 0 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 Down
5 changes: 5 additions & 0 deletions charts/gxf/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading