Merge remote-tracking branch 'upstream/main'

Author: moulalis

examples/deploy-demo/common.sh

@@ -851,6 +851,15 @@ EOF
         --for=condition=Ready --timeout=300s
     log "LLMBatchGateway is ready."
 
+    step "Waiting for AIGateway to be ready..."
+    kubectl wait aigateway/default-aigateway --for=condition=Ready --timeout=300s
+    log "AIGateway is ready."
+
+    # TODO: Change to die once https://github.com/opendatahub-io/ai-gateway-operator/issues/47 is fixed.
+    step "Waiting for DataScienceCluster to be ready..."
+    kubectl wait dsc/default-dsc --for=condition=Ready --timeout=60s \
+        || warn "DataScienceCluster is not Ready (known issue: github.com/opendatahub-io/ai-gateway-operator/issues/47)"
+
     create_batch_httproute
     create_batch_destinationrule
 }
@@ -901,6 +910,8 @@ EOF
         || die "Internal Gateway '${BATCH_INTERNAL_GATEWAY_NAME}' not programmed after 300s."
 
     log "Internal Gateway created (ClusterIP, no TLS, no rate limit)."
+
+    check_batch_internal_gateway
 }
 
 # Verifies the internal gateway is ClusterIP-only and not exposed externally.
@@ -1073,6 +1084,7 @@ JSONL
             _BATCH_FILE_ID=$(_jval id "$body")
             echo "  File uploaded: ${_BATCH_FILE_ID}"
         else
+            echo "  File upload failed (HTTP ${http_code}): ${body}"
             return 1
         fi
 
@@ -1089,6 +1101,7 @@ JSONL
             _BATCH_ID=$(_jval id "$body")
             echo "  Batch created: ${_BATCH_ID}"
         else
+            echo "  Batch creation failed (HTTP ${http_code}): ${body}"
             return 1
         fi
     }
@@ -1263,4 +1276,5 @@ JSONL
     fi
     echo "  Passed: ${_TEST_PASSED}  Failed: ${_TEST_FAILED}  Total: ${_TEST_TOTAL}"
 
+    return "${_TEST_FAILED}"
 }

examples/deploy-demo/deploy-k8s.sh

@@ -846,7 +846,6 @@ cmd_install() {
     create_batch_internal_gateway
     create_batch_llm_route
     apply_batch_llm_auth_policy
-    check_batch_internal_gateway
 
     deploy_batch_gateway_k8s
     apply_batch_auth_policy
@@ -926,16 +925,18 @@ EOF
     local llm_url="${GATEWAY_URL}/${LLM_NAMESPACE}/${MODEL_NAME}/v1/chat/completions"
     local inference_payload="{\"model\":\"${MODEL_NAME}\",\"messages\":[{\"role\":\"user\",\"content\":\"Hello\"}],\"max_tokens\":10}"
 
-    check_batch_internal_gateway
-
+    local test_failures=0
     run_tests "${llm_url}" "${GATEWAY_URL}" "${MODEL_NAME}" \
         "Authorization: Bearer ${token}" \
         "Authorization: Bearer ${unauth_token}" \
-        "${inference_payload}"
+        "${inference_payload}" \
+        || test_failures=$?
 
     if [ "${ENABLE_FLOW_CONTROL}" = "true" ]; then
         verify_flow_control_runtime
     fi
+
+    return "${test_failures}"
 }
 
 # ── Uninstall ────────────────────────────────────────────────────────────────

examples/deploy-demo/deploy-maas.sh

@@ -644,7 +644,6 @@ cmd_install() {
     create_batch_internal_gateway
     create_batch_llm_httproute
     apply_batch_llm_auth_policy
-    check_batch_internal_gateway
 
     deploy_batch_gateway_maas
     apply_batch_auth_policy
@@ -696,13 +695,15 @@ cmd_test() {
     local llm_url="${gw_url}/${LLM_NAMESPACE}/${MAAS_ISVC_NAME}/v1/chat/completions"
     local inference_payload="{\"model\":\"${MAAS_MODEL_NAME}\",\"messages\":[{\"role\":\"user\",\"content\":\"Hello\"}],\"max_tokens\":10}"
 
-    check_batch_internal_gateway
-
+    local test_failures=0
     run_tests "${llm_url}" "${gw_url}" "${MAAS_MODEL_NAME}" \
         "Authorization: Bearer ${api_key}" \
         "Authorization: Bearer ${unauth_api_key}" \
         "${inference_payload}" \
-        "X-MaaS-Subscription: batch-test-subscription"
+        "X-MaaS-Subscription: batch-test-subscription" \
+        || test_failures=$?
+
+    return "${test_failures}"
 }
 
 # ── Uninstall ────────────────────────────────────────────────────────────────

examples/deploy-demo/deploy-rhoai.md

@@ -57,9 +57,9 @@ Batch-route has no authorization — model-level authz is enforced downstream wh
 
 | Mode | Command |
 |------|---------|
-| Auto-detect latest RHOAI (default) | `bash examples/deploy-demo/deploy-rhoai.sh install` |
-| Specific RHOAI version | `RHOAI_VERSION=3.4 bash examples/deploy-demo/deploy-rhoai.sh install` |
-| Custom RHOAI catalog | `CUSTOM_CATALOG=quay.io/rhoai/rhoai-fbc-fragment:...` <br> `bash examples/deploy-demo/deploy-rhoai.sh install` |
+| Latest stable RHOAI (default) | `bash examples/deploy-demo/deploy-rhoai.sh install` |
+| Specific RHOAI channel | `RHOAI_CHANNEL=stable-3.4 bash examples/deploy-demo/deploy-rhoai.sh install` |
+| Custom RHOAI catalog | `CUSTOM_CATALOG=quay.io/rhoai/rhoai-fbc-fragment:...` <br> `RHOAI_CHANNEL=beta bash examples/deploy-demo/deploy-rhoai.sh install` |
 | ODH instead of RHOAI | `OPERATOR_TYPE=odh bash examples/deploy-demo/deploy-rhoai.sh install` |
 
 > See [Environment Variables](#environment-variables) for common parameters.
@@ -133,8 +133,7 @@ Use that only on **ephemeral or dedicated** demo clusters. See [issue #309](http
 | `GW_MAX_BACKOFF` | `60s` | Model gateway max retry backoff |
 | `OPERATOR_TYPE` | `rhoai` | Operator type: `rhoai` or `odh` |
 | `CUSTOM_CATALOG` | — | Custom catalog image for operator (creates CatalogSource) |
-| `RHOAI_VERSION` | (auto-detected) | RHOAI version (e.g. `3.4`). Auto-detected from PackageManifest if not set |
-| `RHOAI_CHANNEL` | (auto-detected) | RHOAI OLM channel (e.g. `stable-3.4`). Auto-detected if not set |
+| `RHOAI_CHANNEL` | `stable-3.x` | RHOAI OLM channel |
 | `ODH_CHANNEL` | `fast-3` | ODH OLM channel (used when `OPERATOR_TYPE=odh`) |
 | `KUADRANT_NAMESPACE` | `kuadrant-system` | Namespace for Connectivity Link (Kuadrant) |
 | `GATEWAY_CLASS_NAME` | `openshift-default` | GatewayClass name |