Update tests

atlassian · Nov 26, 2024 · b9560ae · b9560ae
1 parent 57013ec
commit b9560ae
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 12 deletions.
diff --git a/src/main/charts/bamboo/templates/configmap-server-config.yaml b/src/main/charts/bamboo/templates/configmap-server-config.yaml
@@ -136,7 +136,7 @@ data:
               <Manager pathname=""/>
               <JarScanner scanManifest="false"/>
               <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
-                     threshold="{{ .Values.bamboo.tomcatConfig.stuckThreadDetectionValveThreshold | default "120" }}" />
+                     threshold="{{ .Values.bamboo.tomcatConfig.stuckThreadDetectionValveThreshold | default "60" }}" />
             </Context>
 
           </Host>

diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml
@@ -887,7 +887,7 @@ bamboo:
     proxyInternalIps:
     trustedProxies:
     requestAttributesEnabled:
-    stuckThreadDetectionValveThreshold: "120"
+    stuckThreadDetectionValveThreshold: "60"
 
     # -- Custom server.xml to be mounted into /opt/atlassian/bamboo/conf
     #

diff --git a/src/main/charts/confluence/templates/configmap-server-config.yaml b/src/main/charts/confluence/templates/configmap-server-config.yaml
@@ -48,7 +48,7 @@ data:
               <!-- Logging configuration for Confluence is specified in confluence/WEB-INF/classes/log4j.properties -->
               <Manager pathname=""/>
               <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
-                     threshold="{{ .Values.confluence.tomcatConfig.stuckThreadDetectionValveThreshold | default "120" }}" />
+                     threshold="{{ .Values.confluence.tomcatConfig.stuckThreadDetectionValveThreshold | default "60" }}" />
             {{ if .Values.confluence.accessLog.enabled }}
               <Valve className="org.apache.catalina.valves.AccessLogValve"
                      requestAttributesEnabled="true"

diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml
@@ -950,7 +950,7 @@ confluence:
     maxHttpHeaderSize: "8192"
     proxyInternalIps:
     trustedProxies:
-    stuckThreadDetectionValveThreshold: "120"
+    stuckThreadDetectionValveThreshold: "60"
 
 
     # -- Custom server.xml to be mounted into /opt/atlassian/confluence/conf

diff --git a/src/main/charts/crowd/values.yaml b/src/main/charts/crowd/values.yaml
@@ -385,7 +385,6 @@ crowd:
     maxHttpHeaderSize: "8192"
     accessLogsMaxDays:
     proxyInternalIps:
-    stuckThreadDetectionValveThreshold: "120"
 
   # -- Specifies a list of additional Java libraries that should be added to the
   # Crowd container. Each item in the list should specify the name of the volume

diff --git a/src/main/charts/jira/templates/configmap-server-config.yaml b/src/main/charts/jira/templates/configmap-server-config.yaml
@@ -64,7 +64,7 @@ data:
               <Manager pathname=""/>
               <JarScanner scanManifest="false"/>
               <Valve className="org.apache.catalina.valves.StuckThreadDetectionValve"
-                     threshold="{{ .Values.jira.tomcatConfig.stuckThreadDetectionValveThreshold | default "120" }}" />
+                     threshold="{{ .Values.jira.tomcatConfig.stuckThreadDetectionValveThreshold | default "60" }}" />
             </Context>
 
           </Host>

diff --git a/src/main/charts/jira/values.yaml b/src/main/charts/jira/values.yaml
@@ -814,7 +814,7 @@ jira:
     # proxyPort is set depending on ingress.https value (80 if http, 443 if https)
     proxyPort:
     maxHttpHeaderSize: "8192"
-    stuckThreadDetectionValveThreshold: "120"
+    stuckThreadDetectionValveThreshold: "60"
 
     # -- Custom server.xml to be mounted into /opt/atlassian/jira/conf
     #

diff --git a/src/test/java/test/ServerConfigTest.java b/src/test/java/test/ServerConfigTest.java
@@ -118,7 +118,7 @@ void server_config_config_map(Product product, String generatedByHelm, String re
         assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("proxyPort=\"443\"");
         assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("proxyName=\"" + String.format("%s.com", product.name()));
         if (! product.name().equals("crowd")) {
-            assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("threshold=\"120\"");
+            assertThat(serverConfigMap.getConfigMapData().path("server.xml")).hasTextContaining("threshold=\"60\"");
         }
 
     }

diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml
@@ -217,7 +217,7 @@ data:
         sslEnabled: null
         sslPass: null
         sslProtocol: null
-        stuckThreadDetectionValveThreshold: "120"
+        stuckThreadDetectionValveThreshold: "60"
         trustedProxies: null
         truststoreFile: null
         truststorePass: null

diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml
@@ -197,7 +197,7 @@ data:
         redirectPort: "8443"
         scheme: null
         secure: null
-        stuckThreadDetectionValveThreshold: "120"
+        stuckThreadDetectionValveThreshold: "60"
         trustedProxies: null
         uriEncoding: UTF-8
       topologySpreadConstraints: []

diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml
@@ -176,7 +176,6 @@ data:
         redirectPort: "8443"
         scheme: null
         secure: null
-        stuckThreadDetectionValveThreshold: "120"
       topologySpreadConstraints: []
       umask: "0022"
       useHelmReleaseNameAsContainerName: false

diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml
@@ -235,7 +235,7 @@ data:
         redirectPort: "8443"
         scheme: null
         secure: null
-        stuckThreadDetectionValveThreshold: "120"
+        stuckThreadDetectionValveThreshold: "60"
       topologySpreadConstraints: []
       useHelmReleaseNameAsContainerName: false
     monitoring: