bug(chart): SE_NODE_GRID_URL missing port when hostname is `seleniu…

…m-grid.local`

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

charts/selenium-grid/configs/node/nodeProbe.sh

@@ -27,18 +27,27 @@ replace_localhost_by_service_name
 if curl -sfk ${SE_SERVER_PROTOCOL}://127.0.0.1:${SE_NODE_PORT}/status -o /tmp/nodeProbe${ID}; then
   NODE_ID=$(jq -r '.value.node.nodeId' /tmp/nodeProbe${ID})
   NODE_STATUS=$(jq -r '.value.node.availability' /tmp/nodeProbe${ID})
+  if [ -n "${NODE_ID}" ]; then
+    echo "Node responds the ID: ${NODE_ID} with status: ${NODE_STATUS}"
+  else
+    echo "Wait for the Node to report its status"
+    exit 1
+  fi
 
   curl -sfk "${SE_GRID_URL}/status" -o /tmp/gridProbe${ID}
   GRID_NODE_ID=$(jq -e ".value.nodes[].id|select(. == \"${NODE_ID}\")" /tmp/gridProbe${ID} | tr -d '"' || true)
+  if [ -n "${GRID_NODE_ID}" ]; then
+    echo "Grid responds a matched Node ID: ${GRID_NODE_ID}"
+  fi
 
   if [ "${NODE_STATUS}" = "UP" ] && [ -n "${NODE_ID}" ] && [ -n "${GRID_NODE_ID}" ] && [ "${NODE_ID}" = "${GRID_NODE_ID}" ]; then
-    echo "Node ID: ${NODE_ID} with status: ${NODE_STATUS}"
-    echo "Found in the Grid a matched Node ID: ${GRID_NODE_ID}"
+    echo "Node ID: ${NODE_ID} is found in the Grid. The registration is successful."
     exit 0
   else
     echo "Node ID: ${NODE_ID} is not found in the Grid. The registration could be in progress."
     exit 1
   fi
 else
+  echo "Wait for the Node to report its status"
   exit 1
 fi

charts/selenium-grid/templates/_helpers.tpl

@@ -490,6 +490,8 @@ Get the url of the grid. If the external url can be figured out from the ingress
 {{- if .Values.ingress.enabled -}}
   {{- if or (ne (.Values.ingress.ports.http | toString) "80") (ne (.Values.ingress.ports.https | toString) "443") -}}
     {{- $port = printf ":%s" (ternary (.Values.ingress.ports.http | toString) (.Values.ingress.ports.https | toString) (eq (include "seleniumGrid.url.schema" .) "http")) -}}
+  {{- else if and .Values.ingress.hostname (eq (tpl .Values.ingress.hostname $) "selenium-grid.local") }}
+    {{- $port = $port -}}
   {{- else -}}
     {{- $port = "" -}}
   {{- end -}}

tests/charts/ci/base-auth-ingress-values.yaml

@@ -34,8 +34,6 @@ hub:
       value: "15"
     - name: SE_REJECT_UNSUPPORTED_CAPS
       value: "false"
-    - name: SE_OPTS
-      value: "--max-threads 12"
 
 components:
   subPath: *gridAppRoot