Skip to content
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

Make it possible to override proxy settings #822

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Make it possible to override proxy settings #822

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
7fbbb98
Make it possible to override proxy settings
Jun 20, 2024
3ce0144
Merge branch 'main' into fix-proxy-defaults
nanux Jun 25, 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
6 changes: 3 additions & 3 deletions src/main/charts/bamboo/templates/configmap-server-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ data:
acceptCount="{{ .Values.bamboo.tomcatConfig.acceptCount | default "10" }}"
secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.bamboo.tomcatConfig.secure }}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall these be vice versa as well?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logically yes, but I doubt there's a valid use case to justify setting http in ingress and http in tomcatconfig.

scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.bamboo.tomcatConfig.scheme }}"
proxyName="{{ .Values.ingress.host | default .Values.bamboo.tomcatConfig.proxyName }}"
proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.bamboo.tomcatConfig.proxyPort }}"
proxyName="{{ .Values.bamboo.tomcatConfig.proxyName | default .Values.ingress.host }}"
proxyPort="{{ .Values.bamboo.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https) }}"

{{- if .Values.bamboo.tomcatConfig.address }}
address="{{ .Values.bamboo.tomcatConfig.address }}"
Expand Down Expand Up @@ -192,7 +192,7 @@ data:
<param-name>cookie.encoding</param-name>
<param-value>BAM</param-value>
</init-param>

<init-param>
<param-name>autologin.cookie.age</param-name>
<param-value>{{ .Values.bamboo.seraphConfig.autoLoginCookieAge | default "1209600" }}</param-value>
Expand Down
4 changes: 2 additions & 2 deletions src/main/charts/confluence/templates/configmap-server-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ data:
URIEncoding="{{ .Values.confluence.tomcatConfig.uriEncoding | default "UTF-8" }}"
secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.confluence.tomcatConfig.secure }}"
scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.confluence.tomcatConfig.scheme }}"
proxyName="{{ .Values.ingress.host | default .Values.confluence.tomcatConfig.proxyName }}"
proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.confluence.tomcatConfig.proxyPort }}"
proxyName="{{ .Values.confluence.tomcatConfig.proxyName | default .Values.ingress.host }}"
proxyPort="{{ .Values.confluence.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https) }}"
maxHttpHeaderSize="{{ .Values.confluence.tomcatConfig.maxHttpHeaderSize | default "8192" }}" />

<Engine name="Standalone"
Expand Down
4 changes: 2 additions & 2 deletions src/main/charts/crowd/templates/configmap-server-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ data:
acceptCount="{{ .Values.crowd.tomcatConfig.acceptCount | default "100" }}"
secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.crowd.tomcatConfig.secure }}"
scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.crowd.tomcatConfig.scheme }}"
proxyName="{{ .Values.ingress.host | default .Values.crowd.tomcatConfig.proxyName }}"
proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.crowd.tomcatConfig.proxyPort }}"
proxyName="{{ .Values.crowd.tomcatConfig.proxyName | default .Values.ingress.host }}"
proxyPort="{{ .Values.crowd.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https) }}"
maxHttpHeaderSize="{{ .Values.crowd.tomcatConfig.maxHttpHeaderSize | default "8192" }}"
useBodyEncodingForURI="true"
URIEncoding="UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions src/main/charts/jira/templates/configmap-server-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ data:
acceptCount="{{ .Values.jira.tomcatConfig.acceptCount | default "10" }}"
secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.jira.tomcatConfig.secure }}"
scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.jira.tomcatConfig.scheme }}"
proxyName="{{ .Values.ingress.host | default .Values.jira.tomcatConfig.proxyName }}"
proxyPort="{{ default (ternary "443" "80" .Values.ingress.https) .Values.jira.tomcatConfig.proxyPort }}"
proxyName="{{ .Values.jira.tomcatConfig.proxyName | default .Values.ingress.host }}"
proxyPort="{{ .Values.jira.tomcatConfig.proxyPort | default (ternary "443" "80" .Values.ingress.https) }}"

relaxedPathChars="[]|"
relaxedQueryChars="[]|{}^\`&quot;&lt;&gt;"
Expand Down
Loading