Merge remote-tracking branch 'upstream/main' into rhoai-3.5

Author: m-rafeeq

Makefile

@@ -453,11 +453,12 @@ PROMETHEUS_RELEASE ?= llmd-kube-prometheus-stack
 
 ## test-e2e: Run E2E tests against a live API server (requires TEST_BASE_URL or dev-deploy NodePort services)
 ##           Use TEST_RUN to filter tests, e.g.: make test-e2e TEST_RUN=TestE2E/Batches/Cancel/InProgress
+##           Use TEST_OUTPUT to save JSON test output to a file (adds -json flag), e.g.: make test-e2e TEST_OUTPUT=results.json
 test-e2e:
 	@echo "Running E2E tests..."
 	@OUT=$$(mktemp); \
 	echo "Processor observability endpoint: auto-resolved by the e2e test helpers"; \
-	cd test/e2e && $(GO) test -v -count=1 -timeout=20m $(if $(TEST_RUN),-run $(TEST_RUN)) ./... 2>&1 | tee $$OUT; \
+	cd test/e2e && $(GO) test -v $(if $(TEST_OUTPUT),-json) -count=1 -timeout=20m $(if $(TEST_RUN),-run $(TEST_RUN)) ./... 2>&1 | tee $$OUT; \
 	TEST_EXIT=$${PIPESTATUS[0]}; \
 	PASS_COUNT=$$(grep -- '--- PASS:' $$OUT 2>/dev/null | wc -l | tr -d ' '); \
 	FAIL_COUNT=$$(grep -- '--- FAIL:' $$OUT 2>/dev/null | wc -l | tr -d ' '); \
@@ -473,5 +474,6 @@ test-e2e:
 	else \
 		echo "❌ E2E tests failed with exit code $$TEST_EXIT"; \
 	fi; \
+	if [ -n "$(TEST_OUTPUT)" ]; then cp $$OUT "$(TEST_OUTPUT)"; fi; \
 	rm -f $$OUT; \
 	exit $$TEST_EXIT

docs/guides/deploy-k8s.md

@@ -856,7 +856,8 @@ kubectl rollout status statefulset/postgresql -n ${BATCH_NS} --timeout=120s
 # Install MinIO (S3-compatible object storage for batch files)
 MINIO_USER=<your-minio-user>
 MINIO_PASSWORD=<your-minio-password>
-MINIO_BUCKET=batch-gateway
+MINIO_BUCKET=llm-d-batch-gateway
+MINIO_REGION=us-east-1
 
 kubectl apply -f - <<EOF
 apiVersion: apps/v1
@@ -964,7 +965,8 @@ helm upgrade --install batch-gateway ./charts/batch-gateway \
     --set "global.dbClient.type=postgresql" \
     --set "global.fileClient.type=s3" \
     --set "global.fileClient.s3.endpoint=http://minio.${BATCH_NS}.svc.cluster.local:9000" \
-    --set "global.fileClient.s3.region=us-east-1" \
+    --set "global.fileClient.s3.region=${MINIO_REGION}" \
+    --set "global.fileClient.s3.bucket=${MINIO_BUCKET}" \
     --set "global.fileClient.s3.accessKeyId=${MINIO_USER}" \
     --set "global.fileClient.s3.prefix=${MINIO_BUCKET}" \
     --set "global.fileClient.s3.usePathStyle=true" \

examples/deploy-demo/common.sh

@@ -81,7 +81,8 @@ DEMO_TLS_INSECURE_SKIP_VERIFY="${DEMO_TLS_INSECURE_SKIP_VERIFY:-1}"
 BATCH_MINIO_RELEASE="${BATCH_MINIO_RELEASE:-minio}"
 MINIO_ROOT_USER="${MINIO_ROOT_USER:-minioadmin}"
 MINIO_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD:-minioadmin}"
-MINIO_BUCKET="${MINIO_BUCKET:-batch-gateway}"
+MINIO_BUCKET="${MINIO_BUCKET:-llm-d-batch-gateway}"
+MINIO_REGION="${MINIO_REGION:-us-east-1}"
 # Image overrides. When set, these take precedence over defaults derived from
 # BATCH_RELEASE_VERSION / BATCH_DEV_VERSION. Leave unset to use chart defaults.
 # Example (upstream):
@@ -619,7 +620,8 @@ do_deploy_batch_gateway_helm() {
         local minio_endpoint="http://${BATCH_MINIO_RELEASE}.${BATCH_NAMESPACE}.svc.cluster.local:9000"
         helm_args+=(
             --set "global.fileClient.s3.endpoint=${minio_endpoint}"
-            --set "global.fileClient.s3.region=us-east-1"
+            --set "global.fileClient.s3.region=${MINIO_REGION}"
+            --set "global.fileClient.s3.bucket=${MINIO_BUCKET}"
             --set "global.fileClient.s3.accessKeyId=${MINIO_ROOT_USER}"
             --set "global.fileClient.s3.prefix=${MINIO_BUCKET}"
             --set "global.fileClient.s3.usePathStyle=true"
@@ -776,7 +778,8 @@ do_deploy_batch_gateway_dsc() {
     if [ "${BATCH_STORAGE_TYPE}" = "s3" ]; then
         local minio_endpoint="http://${BATCH_MINIO_RELEASE}.${BATCH_NAMESPACE}.svc.cluster.local:9000"
         file_storage_yaml="    s3:
-      region: us-east-1
+      region: ${MINIO_REGION}
+      bucket: ${MINIO_BUCKET}
       endpoint: ${minio_endpoint}
       accessKeyId: ${MINIO_ROOT_USER}
       prefix: ${MINIO_BUCKET}

examples/deploy-demo/deploy-k8s.md

@@ -124,6 +124,8 @@ Use that only on **ephemeral or dedicated** demo clusters. See [issue #309](http
 | `BATCH_GC_REPO` | — | Override gc image repository |
 | `BATCH_DB_TYPE` | `postgresql` | Database backend: `postgresql` or `redis` |
 | `BATCH_STORAGE_TYPE` | `s3` | File storage: `fs` or `s3` |
+| `MINIO_BUCKET` | `llm-d-batch-gateway` | MinIO bucket name (also used as the S3 `bucket` and `prefix` config values) |
+| `MINIO_REGION` | `us-east-1` | S3 region for MinIO |
 | `DEMO_TLS_INSECURE_SKIP_VERIFY` | `1` | Disables TLS certificate verification for processor → model gateway and Istio Gateway → batch apiserver (**demo/lab only**, [CWE-295](https://cwe.mitre.org/data/definitions/295.html)). Default `1` since demo scripts use self-signed certs. Set to `0` if you have trusted CA certs. |
 | `BATCH_NAMESPACE` | `batch-api` | Namespace for batch-gateway |
 | `LLM_NAMESPACE` | `llm` | Namespace for model serving |