From b052095af5f8a5aea4a297fdc07886611446e24f Mon Sep 17 00:00:00 2001 From: yivantsov-atlassian <52448429+bianchi2@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:07:55 +1000 Subject: [PATCH] Fix default for acceptCount (#832) * Fix default for acceptCount * Update defaults in templates --------- Co-authored-by: Yevhen Ivantsov --- src/main/charts/bamboo/templates/configmap-server-config.yaml | 2 +- src/main/charts/bamboo/values.yaml | 2 +- .../charts/confluence/templates/configmap-server-config.yaml | 2 +- src/main/charts/confluence/values.yaml | 2 +- src/main/charts/jira/templates/configmap-server-config.yaml | 2 +- src/main/charts/jira/values.yaml | 2 +- src/test/resources/expected_helm_output/bamboo/output.yaml | 2 +- src/test/resources/expected_helm_output/confluence/output.yaml | 2 +- src/test/resources/expected_helm_output/jira/output.yaml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/charts/bamboo/templates/configmap-server-config.yaml b/src/main/charts/bamboo/templates/configmap-server-config.yaml index baec8109d..a3aff6737 100644 --- a/src/main/charts/bamboo/templates/configmap-server-config.yaml +++ b/src/main/charts/bamboo/templates/configmap-server-config.yaml @@ -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 }}" diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml index e655ab708..0d07d89f5 100644 --- a/src/main/charts/bamboo/values.yaml +++ b/src/main/charts/bamboo/values.yaml @@ -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) diff --git a/src/main/charts/confluence/templates/configmap-server-config.yaml b/src/main/charts/confluence/templates/configmap-server-config.yaml index c91e02426..a233bd4de 100644 --- a/src/main/charts/confluence/templates/configmap-server-config.yaml +++ b/src/main/charts/confluence/templates/configmap-server-config.yaml @@ -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 }}" diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml index bde5e4c0d..25d3f6da1 100644 --- a/src/main/charts/confluence/values.yaml +++ b/src/main/charts/confluence/values.yaml @@ -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 diff --git a/src/main/charts/jira/templates/configmap-server-config.yaml b/src/main/charts/jira/templates/configmap-server-config.yaml index 5d4a8b4ba..08909dc3f 100644 --- a/src/main/charts/jira/templates/configmap-server-config.yaml +++ b/src/main/charts/jira/templates/configmap-server-config.yaml @@ -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 }}" diff --git a/src/main/charts/jira/values.yaml b/src/main/charts/jira/values.yaml index 023434093..f874c4462 100644 --- a/src/main/charts/jira/values.yaml +++ b/src/main/charts/jira/values.yaml @@ -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) diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml index d539c27f3..a69f9e099 100644 --- a/src/test/resources/expected_helm_output/bamboo/output.yaml +++ b/src/test/resources/expected_helm_output/bamboo/output.yaml @@ -179,7 +179,7 @@ data: secretName: adminTestSecret usernameSecretKey: adminTestUsernameKey tomcatConfig: - acceptCount: "10" + acceptCount: "100" address: null bambooEncryptionKey: null clientAuth: null diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml index c47339c9a..5cc9a858a 100644 --- a/src/test/resources/expected_helm_output/confluence/output.yaml +++ b/src/test/resources/expected_helm_output/confluence/output.yaml @@ -175,7 +175,7 @@ data: initialDelaySeconds: 60 periodSeconds: 5 tomcatConfig: - acceptCount: "10" + acceptCount: "100" connectionTimeout: "20000" customServerXml: "" debug: "0" diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml index f2cabd143..b4488bf5a 100644 --- a/src/test/resources/expected_helm_output/jira/output.yaml +++ b/src/test/resources/expected_helm_output/jira/output.yaml @@ -207,7 +207,7 @@ data: initialDelaySeconds: 60 periodSeconds: 5 tomcatConfig: - acceptCount: "10" + acceptCount: "100" connectionTimeout: "20000" customServerXml: "" enableLookups: "false"