K8s: Fix template issue on Helm version v3.18.0

VietND96 · VietND96 · commit 365c10659905 · 2025-05-26T18:49:06.000+07:00
Signed-off-by: Viet Nguyen Duc &lt;nguyenducviet4496@gmail.com&gt;
diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml
@@ -121,7 +121,7 @@ jobs:
             test-strategy: playwright_connect_grid
           - k8s-version: 'v1.33.1'
             cluster: 'minikube'
-            helm-version: 'v3.17.3'
+            helm-version: 'v3.18.0'
             docker-version: '26.1.4'
             python-version: '3.10'
             test-upgrade: true
diff --git a/charts/selenium-grid/templates/_helpers.tpl b/charts/selenium-grid/templates/_helpers.tpl
@@ -877,8 +877,8 @@ Define terminationGracePeriodSeconds of the node pod.
 2. IF node.terminationGracePeriodSeconds is greater than autoscaling.terminationGracePeriodSeconds, use node.terminationGracePeriodSeconds
 */}}
 {{- define "seleniumGrid.node.terminationGracePeriodSeconds" -}}
-{{- $autoscalingPeriod := default 0 .Values.autoscaling.terminationGracePeriodSeconds -}}
-{{- $nodePeriod := default 0 .node.terminationGracePeriodSeconds -}}
+{{- $autoscalingPeriod := default 0 .Values.autoscaling.terminationGracePeriodSeconds | int -}}
+{{- $nodePeriod := default 0 .node.terminationGracePeriodSeconds | int -}}
 {{- $period := $nodePeriod -}}
 {{- if and (eq .Values.autoscaling.scalingType "deployment") (eq (include "seleniumGrid.useKEDA" $) "true") -}}
   {{- $period = ternary $nodePeriod $autoscalingPeriod (gt $nodePeriod $autoscalingPeriod) -}}
diff --git a/tests/charts/make/chart_test.sh b/tests/charts/make/chart_test.sh
@@ -260,7 +260,7 @@ if [ "${SELENIUM_GRID_AUTOSCALING}" = "true" ] && [ "${CLEAR_POD_HISTORY}" = "tr
   "
 fi
 
-if [ "${CHART_ENABLE_INGRESS_HOSTNAME}" = "true" ]; then
+if [ "${CHART_ENABLE_INGRESS_HOSTNAME}" = "true" ] && [ "${RENDER_HELM_TEMPLATE_ONLY}" != "true" ]; then
   if [[ ! $(cat /etc/hosts) == *"${HOSTNAME_ADDRESS}"* ]]; then
     sudo -- sh -c -e "echo \"$(hostname -I | cut -d' ' -f1) ${HOSTNAME_ADDRESS}\" >> /etc/hosts"
   fi

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ if [ "${SELENIUM_GRID_AUTOSCALING}" = "true" ] && [ "${CLEAR_POD_HISTORY}" = "tr`
`260`	`260`	`"`
`261`	`261`	`fi`
`262`	`262`
`263`		`-if [ "${CHART_ENABLE_INGRESS_HOSTNAME}" = "true" ]; then`
	`263`	`+if [ "${CHART_ENABLE_INGRESS_HOSTNAME}" = "true" ] && [ "${RENDER_HELM_TEMPLATE_ONLY}" != "true" ]; then`
`264`	`264`	`if [[ ! $(cat /etc/hosts) == "${HOSTNAME_ADDRESS}" ]]; then`
`265`	`265`	`sudo -- sh -c -e "echo \"$(hostname -I \| cut -d' ' -f1) ${HOSTNAME_ADDRESS}\" >> /etc/hosts"`
`266`	`266`	`fi`