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

Author: m-rafeeq

.golangci.yml

@@ -9,7 +9,7 @@
 # excluded from errcheck. Write-path Close errors (e.g. after writing
 # to a file) should still be checked explicitly.
 
-# v2 is required for Go 1.25+ (v1 does not support Go 1.25).
+# v2 is required for Go 1.25+ (v1 does not support Go 1.25 or later).
 # See: https://github.com/golangci/golangci-lint/issues/5873
 version: "2"
 

README.md

@@ -1,7 +1,7 @@
 # Batch Gateway
 
 [![Go Report Card](https://goreportcard.com/badge/github.com/llm-d/llm-d-batch-gateway)](https://goreportcard.com/report/github.com/llm-d/llm-d-batch-gateway)
-[![Go Version](https://img.shields.io/badge/Go-1.25-blue.svg)](https://golang.org/)
+[![Go Version](https://img.shields.io/badge/Go-1.26-blue.svg)](https://golang.org/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 [![Join Slack](https://img.shields.io/badge/Join_Slack-blue?logo=slack)](https://llm-d.slack.com/archives/C0AA8772H7T)
 [![apiserver](https://img.shields.io/github/v/release/llm-d/llm-d-batch-gateway?label=apiserver)](https://github.com/llm-d/llm-d-batch-gateway/pkgs/container/batch-gateway-apiserver)
@@ -162,7 +162,7 @@ batch-gateway/
 
 ### Prerequisites
 
-- Go 1.25 or later.
+- Go 1.26 or later.
 - PostgreSQL 12+ (for metadata storage).
 - Redis 6+ or Valkey 8+ (for job queue).
 - S3-compatible object storage or local filesystem.

docker/Dockerfile.apiserver.konflux

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25.8@sha256:8c5aeac74b4b60dc2e5e44f6b639186b7ec2fec8f0eb9a36d4a32dcf8e255f52 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26.5@sha256:f99dd81b20e5971ef9f63a51ac27cf0aa591ff9921d021490548b67fd9b17144 as builder
 ARG TARGETOS=linux
 ARG TARGETARCH
 ARG CGO_ENABLED=1

docker/Dockerfile.gc.konflux

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25.8@sha256:8c5aeac74b4b60dc2e5e44f6b639186b7ec2fec8f0eb9a36d4a32dcf8e255f52 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26.5@sha256:f99dd81b20e5971ef9f63a51ac27cf0aa591ff9921d021490548b67fd9b17144 as builder
 ARG TARGETOS=linux
 ARG TARGETARCH
 ARG CGO_ENABLED=1

docker/Dockerfile.processor.konflux

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25.8@sha256:8c5aeac74b4b60dc2e5e44f6b639186b7ec2fec8f0eb9a36d4a32dcf8e255f52 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26.5@sha256:f99dd81b20e5971ef9f63a51ac27cf0aa591ff9921d021490548b67fd9b17144 as builder
 ARG TARGETOS=linux
 ARG TARGETARCH
 ARG CGO_ENABLED=1

go.mod

@@ -1,6 +1,6 @@
 module github.com/llm-d/llm-d-batch-gateway
 
-go 1.25.0
+go 1.26.0
 
 require (
 	github.com/alicebob/miniredis/v2 v2.38.0

test/e2e/README.md

@@ -5,7 +5,7 @@ End-to-end tests for the batch-gateway. They run against a live deployment and c
 ## Prerequisites
 
 - `kubectl`, `helm`, `kind`, Docker or Podman
-- Go 1.25+
+- Go 1.26+
 
 ## 1. Deploy the server
 

test/e2e/e2e_test.go

@@ -39,6 +39,10 @@ var (
 	testPostgresqlRelease = getEnvOrDefault("TEST_POSTGRESQL_RELEASE", "postgresql")
 	testRedisRelease      = getEnvOrDefault("TEST_REDIS_RELEASE", "redis")
 	testDBPod             = getEnvOrDefault("TEST_DB_POD", "")
+	testDBNamespace       = getEnvOrDefault("TEST_DB_NAMESPACE", "")
+	testDBName            = getEnvOrDefault("TEST_DB_NAME", "postgres")
+	testDBUser            = getEnvOrDefault("TEST_DB_USER", "postgres")
+	testEPPNamespace      = getEnvOrDefault("TEST_EPP_NAMESPACE", "")
 
 	// testDBClientType and testExchangeClientType are detected from Helm
 	// releases at startup; see detectDBClientType / detectExchangeClientType.

test/e2e/flow_control_test.go

@@ -311,13 +311,24 @@ func doTestRetryExhaustion(t *testing.T) {
 //   - Mixed load with metrics: verify batch completion alongside interactive
 //     traffic with retry/shedding counters. Requires EPP to export scheduling metrics.
 
-// detectGIEDeployed checks whether at least one EPP deployment exists
-// in the test namespace.
+// detectGIEDeployed checks whether at least one EPP deployment exists.
+// It searches testEPPNamespace (TEST_EPP_NAMESPACE) if set, otherwise
+// testNamespace. Set TEST_GIE_DEPLOYED=true to force-enable GIE tests
+// when the EPP naming convention differs (e.g. RHOAI).
 func detectGIEDeployed(t *testing.T) bool {
 	t.Helper()
 
+	if strings.EqualFold(getEnvOrDefault("TEST_GIE_DEPLOYED", ""), "true") {
+		return true
+	}
+
+	ns := testEPPNamespace
+	if ns == "" {
+		ns = testNamespace
+	}
+
 	out, err := exec.Command("kubectl", "get", "deployments",
-		"-n", testNamespace,
+		"-n", ns,
 		"-o", "name",
 	).CombinedOutput()
 	if err != nil {

test/e2e/gc_test.go

@@ -52,11 +52,19 @@ func expireInPostgresql(t *testing.T, table, id string) {
 		podName = fmt.Sprintf("%s-0", testPostgresqlRelease)
 	}
 
+	ns := testDBNamespace
+	if ns == "" {
+		ns = testNamespace
+	}
+
 	sql := fmt.Sprintf("UPDATE %s SET expiry = 1 WHERE id = '%s'", table, id)
-	cmd := fmt.Sprintf(`PGPASSWORD="$(cat "$POSTGRES_PASSWORD_FILE")" psql -U postgres -d postgres -c %q`, sql)
+	cmd := fmt.Sprintf(
+		`PGPASSWORD="${POSTGRESQL_PASSWORD:-$(cat "$POSTGRES_PASSWORD_FILE" 2>/dev/null)}" psql -U '%s' -d '%s' -c %q`,
+		testDBUser, testDBName, sql,
+	)
 	out, err := exec.Command("kubectl", "exec",
 		podName,
-		"-n", testNamespace,
+		"-n", ns,
 		"--", "bash", "-c", cmd,
 	).CombinedOutput()
 	if err != nil {