Skip to content

Commit

Permalink
Fix default for acceptCount (#832)
Browse files Browse the repository at this point in the history
* Fix default for acceptCount

* Update defaults in templates

---------

Co-authored-by: Yevhen Ivantsov <[email protected]>
  • Loading branch information
bianchi2 and Yevhen Ivantsov authored Jul 15, 2024
1 parent 627bf69 commit b052095
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
enableLookups="{{ .Values.bamboo.tomcatConfig.enableLookups | default "false" }}"
protocol="{{ .Values.bamboo.tomcatConfig.protocol | default "HTTP/1.1" }}"
redirectPort="{{ .Values.bamboo.tomcatConfig.redirectPort | default "8443" }}"
acceptCount="{{ .Values.bamboo.tomcatConfig.acceptCount | default "10" }}"
acceptCount="{{ .Values.bamboo.tomcatConfig.acceptCount | default "100" }}"
secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.bamboo.tomcatConfig.secure }}"
scheme="{{ default (ternary "https" "http" .Values.ingress.https) .Values.bamboo.tomcatConfig.scheme }}"
proxyName="{{ .Values.bamboo.tomcatConfig.proxyName | default .Values.ingress.host }}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/charts/bamboo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ bamboo:
enableLookups: "false"
protocol: "HTTP/1.1"
redirectPort: "8443"
acceptCount: "10"
acceptCount: "100"
# secure is retrieved from ingress.https value
secure:
# scheme is set depending on ingress.https value (http if false, https if true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ data:
enableLookups="{{ .Values.confluence.tomcatConfig.enableLookups | default "false" }}"
protocol="{{ .Values.confluence.tomcatConfig.protocol | default "org.apache.coyote.http11.Http11NioProtocol" }}"
redirectPort="{{ .Values.confluence.tomcatConfig.redirectPort | default "8443" }}"
acceptCount="{{ .Values.confluence.tomcatConfig.acceptCount | default "10" }}"
acceptCount="{{ .Values.confluence.tomcatConfig.acceptCount | default "100" }}"
debug="{{ .Values.confluence.tomcatConfig.debug | default "0" }}"
URIEncoding="{{ .Values.confluence.tomcatConfig.uriEncoding | default "UTF-8" }}"
secure="{{ default (ternary "true" "false" .Values.ingress.https) .Values.confluence.tomcatConfig.secure }}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/charts/confluence/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ confluence:
enableLookups: "false"
protocol: "org.apache.coyote.http11.Http11NioProtocol"
redirectPort: "8443"
acceptCount: "10"
acceptCount: "100"
debug: "0"
uriEncoding: "UTF-8"
# secure is retrieved from ingress.https value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
enableLookups="{{ .Values.jira.tomcatConfig.enableLookups | default "false" }}"
protocol="{{ .Values.jira.tomcatConfig.protocol | default "HTTP/1.1" }}"
redirectPort="{{ .Values.jira.tomcatConfig.redirectPort | default "8443" }}"
acceptCount="{{ .Values.jira.tomcatConfig.acceptCount | default "10" }}"
acceptCount="{{ .Values.jira.tomcatConfig.acceptCount | default "100" }}"
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.jira.tomcatConfig.proxyName | default .Values.ingress.host }}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/charts/jira/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ jira:
enableLookups: "false"
protocol: "HTTP/1.1"
redirectPort: "8443"
acceptCount: "10"
acceptCount: "100"
# secure is retrieved from ingress.https value
secure:
# scheme is set depending on ingress.https value (http if false, https if true)
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/expected_helm_output/bamboo/output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ data:
secretName: adminTestSecret
usernameSecretKey: adminTestUsernameKey
tomcatConfig:
acceptCount: "10"
acceptCount: "100"
address: null
bambooEncryptionKey: null
clientAuth: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ data:
initialDelaySeconds: 60
periodSeconds: 5
tomcatConfig:
acceptCount: "10"
acceptCount: "100"
connectionTimeout: "20000"
customServerXml: ""
debug: "0"
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/expected_helm_output/jira/output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ data:
initialDelaySeconds: 60
periodSeconds: 5
tomcatConfig:
acceptCount: "10"
acceptCount: "100"
connectionTimeout: "20000"
customServerXml: ""
enableLookups: "false"
Expand Down

0 comments on commit b052095

Please sign in to comment.