Merge branch '64-allow-maxthreads-in-the-tomcat-config-to-be-configurable-via-values' into 'main'

Resolve "allow maxThreads in the tomcat config to be configurable via values"

Closes #64

See merge request !81

CHANGELOG.md

@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
+## [1.1.2311007-bb.4] - 2023-10-25
+### Updated
+- Allow overriding mix and max threads for ssc tomcat server
+
 ## [1.1.2311007-bb.3] - 2023-10-12
 ### Updated
 - Updated cypress implementation to fix broken pipeline

README.md

 # fortify-ssc
 
-![Version: 1.1.2311007-bb.3](https://img.shields.io/badge/Version-1.1.2311007--bb.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.2.0005](https://img.shields.io/badge/AppVersion-23.1.2.0005-informational?style=flat-square)
+![Version: 1.1.2311007-bb.4](https://img.shields.io/badge/Version-1.1.2311007--bb.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.2.0005](https://img.shields.io/badge/AppVersion-23.1.2.0005-informational?style=flat-square)
 
 A Helm chart for Fortify Software Security Center application
 
@@ -76,6 +76,10 @@ helm install fortify-ssc chart/
 | secretRef.keys.httpTruststorePasswordEntry | string | `""` |  |
 | secretRef.keys.jvmTruststoreFileEntry | string | `""` |  |
 | secretRef.keys.jvmTruststorePasswordEntry | string | `""` |  |
+| ssc.config.http.min_threads | int | `1` |  |
+| ssc.config.http.max_threads | int | `4` |  |
+| ssc.config.https.min_threads | int | `4` |  |
+| ssc.config.https.max_threads | int | `150` |  |
 | persistentVolumeClaim.size | string | `"4Gi"` |  |
 | persistentVolumeClaim.storageClassName | string | `""` |  |
 | persistentVolumeClaim.selector | object | `{}` |  |

chart/Chart.yaml

 apiVersion: v2
 description: A Helm chart for Fortify Software Security Center application
 name: fortify-ssc
-version: 1.1.2311007-bb.3
+version: 1.1.2311007-bb.4
 appVersion: 23.1.2.0005
 type: application
 keywords:

chart/templates/tomcat-configmap.yaml

@@ -51,7 +51,8 @@ data:
                 Java AJP  Connector: /docs/config/ajp.html
                 APR (HTTP/AJP) Connector: /docs/apr.html
             -->
-            <Connector maxThreads="4" minSpareThreads="1"
+            {{- with .Values.ssc.config }}
+            <Connector maxThreads="{{ .http.max_threads }}" minSpareThreads="{{ .http.min_threads }}"
                     port="8080"
                     protocol="org.apache.coyote.http11.Http11Nio2Protocol"
                     server="Apache"
@@ -60,7 +61,7 @@ data:
                     secure="false"
             />
 
-            <Connector maxThreads="150" minSpareThreads="4"
+            <Connector maxThreads="{{ .https.max_threads }}" minSpareThreads="{{ .https.min_threads }}"
                     port="8443"
                     protocol="org.apache.coyote.http11.Http11Nio2Protocol"
                     server="Apache"
@@ -72,6 +73,7 @@ data:
                     SSLEnabled="true"
                     sslImplementationName="org.apache.tomcat.util.net.jsse.JSSEImplementation"
             >
+            {{- end }}
                 <SSLHostConfig
                         protocols="${HTTP_SERVER_TLS_PROTOCOLS}"
                         ciphers="${HTTP_SERVER_TLS_CIPHERS??}"

chart/values.yaml

@@ -126,6 +126,14 @@ secretRef:
     # jvmTruststorePasswordEntry is a key name for a password of the JVM truststore
     jvmTruststorePasswordEntry: ""
 
+ssc:
+  config:
+    http:
+      min_threads: 1
+      max_threads: 4
+    https:
+      min_threads: 4
+      max_threads: 150
 
 # persistentVolumeClaim is a set of SSC's persistent volume claim options
 persistentVolumeClaim:

docs/DEVELOPMENT_MAINTENANCE.md

@@ -100,6 +100,8 @@ This is a high-level list of modifications that Big Bang has made to the upstrea
 - add script-configmap.yaml
 - add secrets.yaml
 - add tomcat-configuration.yaml
+- modify tomcat-configuration.yaml
+  - Allow setting Tomcat server min/max threads within server configuration configmap
 - modify webapp.yaml
   - set spec.template.spec.containers["webapp"].readinessProbe.initialDelaySeconds to `30`
   - set spec.template.spec.containers["webapp"].readinessProbe.periodSeconds to `20`
@@ -216,6 +218,17 @@ This is a high-level list of modifications that Big Bang has made to the upstrea
       cpu: 1
       memory: 1Gi
   ```
+- allow overriding mix and max threads allowed by ssc server with:
+  ```yaml
+  ssc:
+    config:
+      http:
+        min_threads: 1
+        max_threads: 4
+      https:
+        min_threads: 4
+        max_threads: 150
+  ```
 - add this to the bottom
   ```yaml
   # MySQL Dependency Values