feat(chart): Configure fixed-sized thread pool for the Distributor to…

… create new sessions

Signed-off-by: Viet Nguyen Duc <[email protected]>

.github/workflows/helm-chart-test.yml

@@ -40,12 +40,12 @@ jobs:
             test-existing-keda: true
           - k8s-version: 'v1.26.15'
             test-strategy: deployment
-            cluster: 'kind'
+            cluster: 'minikube'
             helm-version: 'v3.11.3'
             test-existing-keda: true
           - k8s-version: 'v1.27.12'
             test-strategy: job_https
-            cluster: 'kind'
+            cluster: 'minikube'
             helm-version: 'v3.12.3'
             test-existing-keda: true
           - k8s-version: 'v1.28.8'

Distributor/start-selenium-grid-distributor.sh

@@ -93,6 +93,11 @@ if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
   SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
 fi
 
+if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
+  echo "Appending Selenium options: --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+  SE_OPTS="$SE_OPTS --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+fi
+
 EXTRA_LIBS=""
 
 if [ "$SE_ENABLE_TRACING" = "true" ]; then

Hub/start-selenium-grid-hub.sh

@@ -66,6 +66,11 @@ if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
   SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
 fi
 
+if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
+  echo "Appending Selenium options: --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+  SE_OPTS="$SE_OPTS --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+fi
+
 EXTRA_LIBS=""
 
 if [ "$SE_ENABLE_TRACING" = "true" ]; then

Standalone/start-selenium-standalone.sh

@@ -70,6 +70,11 @@ if [ ! -z "$SE_REJECT_UNSUPPORTED_CAPS" ]; then
   SE_OPTS="$SE_OPTS --reject-unsupported-caps ${SE_REJECT_UNSUPPORTED_CAPS}"
 fi
 
+if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
+  echo "Appending Selenium options: --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+  SE_OPTS="$SE_OPTS --newsession-threadpool-size ${SE_NEW_SESSION_THREAD_POOL_SIZE}"
+fi
+
 /opt/bin/generate_config
 
 echo "Selenium Grid Standalone configuration: "

charts/selenium-grid/templates/distributor-deployment.yaml

@@ -52,6 +52,10 @@ spec:
               value: '{{ template "seleniumGrid.sessionQueue.fullname" . }}.{{ .Release.Namespace }}'
             - name: SE_SESSION_QUEUE_PORT
               value: {{ .Values.components.sessionQueue.port | quote }}
+            {{- with .Values.components.distributor.newSessionThreadPoolSize }}
+            - name: SE_NEW_SESSION_THREAD_POOL_SIZE
+              value: {{ . | quote }}
+            {{- end }}
           {{- with .Values.components.extraEnvironmentVariables }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}

charts/selenium-grid/templates/hub-deployment.yaml

@@ -109,6 +109,10 @@ spec:
             - name: SE_DISABLE_UI
               value: {{ .Values.hub.disableUI | quote }}
             {{- end }}
+            {{- with .Values.hub.newSessionThreadPoolSize }}
+            - name: SE_NEW_SESSION_THREAD_POOL_SIZE
+              value: {{ . | quote }}
+            {{- end }}
           {{- with .Values.hub.extraEnvironmentVariables }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}

charts/selenium-grid/templates/router-deployment.yaml

@@ -59,9 +59,9 @@ spec:
             - name: SE_SUB_PATH
               value: {{ . | quote }}
             {{- end }}
-            {{- if .Values.components.disableUI }}
+            {{- if .Values.components.router.disableUI }}
             - name: SE_DISABLE_UI
-              value: {{ .Values.components.disableUI | quote }}
+              value: {{ .Values.components.router.disableUI | quote }}
             {{- end }}
           {{- with .Values.components.extraEnvironmentVariables }}
             {{- tpl (toYaml .) $ | nindent 12 }}

charts/selenium-grid/values.yaml

@@ -201,6 +201,8 @@ components:
     # Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)
     imagePullSecret: ""
 
+    # Disable the Grid UI
+    disableUI: false
     # Custom annotations for router pods
     annotations: {}
     # Router port
@@ -263,6 +265,8 @@ components:
     # Image pull secret (see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)
     imagePullSecret: ""
 
+    # Configure fixed-sized thread pool for the Distributor to create new sessions as it consumes new session requests from the queue
+    newSessionThreadPoolSize:
     # Custom annotations for Distributor pods
     annotations: {}
     # Distributor port
@@ -387,8 +391,6 @@ components:
 
   # Custom sub path for all components
   subPath: ""
-  # Disable the Grid UI
-  disableUI: false
 
   # Custom environment variables for all components
   extraEnvironmentVariables:
@@ -425,6 +427,8 @@ hub:
   labels: {}
   # Disable the Grid UI
   disableUI: false
+  # Configure fixed-sized thread pool for the Distributor to create new sessions as it consumes new session requests from the queue
+  newSessionThreadPoolSize:
   # Port where events are published
   publishPort: 4442
   publishNodePort: 31442

tests/charts/templates/render/dummy.yaml

@@ -62,8 +62,8 @@ isolateComponents: true
 
 components:
   subPath: *gridAppRoot
-  disableUI: true
   router:
+    disableUI: true
     annotations:
       "restartOnUpdate": "true"
     serviceType: NodePort

tests/charts/templates/render/dummy_solution.yaml

@@ -63,8 +63,8 @@ selenium-grid:
 
   components:
     subPath: *gridAppRoot
-    disableUI: true
     router:
+      disableUI: true
       serviceType: NodePort
     distributor:
       serviceType: NodePort