K8s: Node template handle hpa.platformName different with default i…

…n `values.yaml` Signed-off-by: Viet Nguyen Duc <[email protected]>
SeleniumHQ · Jan 3, 2025 · da7612b · da7612b
1 parent 710783e
commit da7612b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/charts/selenium-grid/templates/_helpers.tpl b/charts/selenium-grid/templates/_helpers.tpl
@@ -349,7 +349,7 @@ template:
         {{- end }}
         {{- if and (eq (include "seleniumGrid.useKEDA" $) "true") }}
           - name: SE_NODE_PLATFORM_NAME
-            value: {{ default "Linux" .node.hpa.platformName | quote }}
+            value: {{ default "" .node.hpa.platformName | quote }}
         {{- end }}
           - name: SE_NODE_CONTAINER_NAME
             valueFrom:

diff --git a/tests/charts/make/chart_build.sh b/tests/charts/make/chart_build.sh
@@ -1,17 +1,8 @@
 #!/bin/bash
-set -x
+set -o xtrace
 
 SET_VERSION=${SET_VERSION:-"true"}
 CHART_PATH=${CHART_PATH:-"charts/selenium-grid"}
-# Function to be executed on command failure
-on_failure() {
-    local exit_status=$?
-    echo "There is step failed with exit status $exit_status"
-    exit $exit_status
-}
-
-# Trap ERR signal and call on_failure function
-trap 'on_failure' ERR
 
 cd tests || true
 
@@ -21,12 +12,9 @@ if [ "${CI:-false}" = "false" ]; then
   source docker-selenium-tests/bin/activate
 else
   export PATH=$PATH:/home/$USER/.local/bin
-  pip3 install -U yamale yamllint
 fi
 
-python3 -m pip install yamale==4.0.4 \
-                      yamllint==1.33.0 \
-                      | grep -v 'Requirement already satisfied' || true
+python3 -m pip install -r requirements.txt | grep -v 'Requirement already satisfied'
 
 cd ..
 rm -rf ${CHART_PATH}/Chart.lock

diff --git a/tests/charts/templates/test.py b/tests/charts/templates/test.py
@@ -358,6 +358,10 @@ def test_scaler_triggers_parameter_nodeMaxSessions_global_and_individual_value(s
                     for env in doc['spec']['template']['spec']['containers'][0]['env']:
                         if env['name'] == 'SE_NODE_MAX_SESSIONS':
                             self.assertTrue(env['value'] == str(resources_name[doc['metadata']['name']]), "Value is not matched")
+                        if env['name'] == 'SE_NODE_PLATFORM_NAME':
+                            self.assertTrue(env['value'] == "", "Platform name is not matched")
+                        if env['name'] == 'SE_NODE_BROWSER_VERSION':
+                            self.assertTrue(env['value'] == "", "Browser version is not matched")
                             count += 1
         self.assertEqual(count, len(resources_name.keys()), f"Expected {len(resources_name.keys())} resources but found {count}")
 

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -3,3 +3,5 @@ requests
 chardet
 csv2md
 selenium
+yamale
+yamllint
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,5 @@ requests @@
     chardet
     csv2md
     selenium
+    yamale
+    yamllint