some needed changes

Signed-off-by: Michael Kalantar <kalantar@us.ibm.com>

Author: kalantar

setup/functions.sh

@@ -543,6 +543,36 @@ function not_valid_ip {
 }
 export -f not_valid_ip
 
+function validate_dns_name {
+  local dns_name="$1"
+  # Regex for a valid DNS name (FQDN)
+  # - Must be between 1 and 253 characters long (inclusive)
+  # - Labels separated by dots
+  # - Each label must start and end with an alphanumeric character
+  # - Labels can contain hyphens, but not at the beginning or end
+  # - TLD must be at least 2 characters long
+  local regex="^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$"
+
+  if [[ "$dns_name" =~ $regex ]]; then
+    # Check overall length
+    if (( ${#dns_name} >= 1 && ${#dns_name} <= 253 )); then
+      # Check label length (each label max 63 chars)
+      IFS='.' read -ra labels <<< "$dns_name"
+      for label in "${labels[@]}"; do
+        if (( ${#label} == 0 || ${#label} > 63 )); then
+          return 1
+        fi
+      done
+      return 0
+    else
+      return 1
+    fi
+  else
+    return 1
+  fi
+}
+export -f validate_dns_name
+
 function get_rand_string {
   if [[ -x $(command -v openssl) ]]; then
     openssl rand -base64 4 | tr -dc 'a-zA-Z0-9' | tr '[:upper:]' '[:lower:]' | head -c 16

setup/steps/09_deploy_via_modelservice.sh

@@ -296,7 +296,11 @@ EOF
       if [[ -z $is_route ]]
       then
         announce "📜 Exposing pods serving model ${model} as service..."
-        llmdbench_execute_cmd "${LLMDBENCH_CONTROL_KCMD} --namespace ${LLMDBENCH_VLLM_COMMON_NAMESPACE} expose service/infra-${LLMDBENCH_VLLM_MODELSERVICE_RELEASE}-inference-gateway --target-port=${LLMDBENCH_VLLM_COMMON_INFERENCE_PORT} --name=${LLMDBENCH_VLLM_MODELSERVICE_RELEASE}-inference-gateway-route" ${LLMDBENCH_CONTROL_DRY_RUN} ${LLMDBENCH_CONTROL_VERBOSE}
+        if [[ $LLMDBENCH_VLLM_MODELSERVICE_GATEWAY_CLASS_NAME == "istio" ]]; then
+          llmdbench_execute_cmd "${LLMDBENCH_CONTROL_KCMD} --namespace ${LLMDBENCH_VLLM_COMMON_NAMESPACE} expose service/infra-${LLMDBENCH_VLLM_MODELSERVICE_RELEASE}-inference-gateway-istio --target-port=${LLMDBENCH_VLLM_COMMON_INFERENCE_PORT} --name=${LLMDBENCH_VLLM_MODELSERVICE_RELEASE}-inference-gateway-route" ${LLMDBENCH_CONTROL_DRY_RUN} ${LLMDBENCH_CONTROL_VERBOSE}
+        else
+          llmdbench_execute_cmd "${LLMDBENCH_CONTROL_KCMD} --namespace ${LLMDBENCH_VLLM_COMMON_NAMESPACE} expose service/infra-${LLMDBENCH_VLLM_MODELSERVICE_RELEASE}-inference-gateway --target-port=${LLMDBENCH_VLLM_COMMON_INFERENCE_PORT} --name=${LLMDBENCH_VLLM_MODELSERVICE_RELEASE}-inference-gateway-route" ${LLMDBENCH_CONTROL_DRY_RUN} ${LLMDBENCH_CONTROL_VERBOSE}
+        fi
         announce "✅ Service for pods service model ${model} created"
       fi
       announce "✅ Model \"${model}\" and associated service deployed."

setup/steps/10_smoketest.sh

@@ -62,9 +62,18 @@ for model in ${LLMDBENCH_DEPLOY_MODEL_LIST//,/ }; do
     exit 1
   fi
 
-  if [[ -z $(not_valid_ip ${service_ip}) ]]; then
-    announce "❌ Invalid IP (\"${service_ip}\") for service/gateway \"${service_name}\"!"
-    exit 1
+  if [[ $LLMDBENCH_VLLM_MODELSERVICE_GATEWAY_CLASS_NAME == "istio" ]]; then
+    $(validate_dns_name ${service_ip})
+    stat=$?
+    if [[ $stat -ne 0 ]]; then
+      announce "❌ Invalid DNS name (\"${service_ip}\") for service/gateway \"${service_name}\"!"
+      exit 1
+    fi
+  else
+    if [[ -z $(not_valid_ip ${service_ip}) ]]; then
+      announce "❌ Invalid IP (\"${service_ip}\") for service/gateway \"${service_name}\"!"
+      exit 1
+    fi
   fi
 
   announce "🚀 Testing service/gateway \"${service_name}\" (\"${service_ip}\") (port 80)..."