From a326100cb338cc79987984957b433a6900c2a5e4 Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Sun, 12 Apr 2026 13:18:02 +0200
Subject: [PATCH 1/2] build: upgrade to Go 1.26.2 to fix CVEs

Signed-off-by: Ignasi Barrera <nacx@apache.org>
---
 go.mod       | 2 +-
 tools/go.mod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 2b6d87910b..10c3b84988 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
 module github.com/envoyproxy/ai-gateway
 
 // Explicitly specify the Go patch version to be able to purge the CI cache correctly.
-go 1.25.8
+go 1.26.2
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
diff --git a/tools/go.mod b/tools/go.mod
index 071c3dc984..0357a1ef08 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/envoyproxy/ai-gateway/tools
 
-go 1.25.8
+go 1.26.2
 
 tool (
 	github.com/apache/skywalking-eyes/cmd/license-eye

From 2f133173108d1529fb94c898f002f6235532630d Mon Sep 17 00:00:00 2001
From: Ignasi Barrera <nacx@apache.org>
Date: Sun, 12 Apr 2026 13:20:57 +0200
Subject: [PATCH 2/2] update dockerfile and test files

Signed-off-by: Ignasi Barrera <nacx@apache.org>
---
 Dockerfile                                    | 2 +-
 cmd/aigw/docker-compose.yaml                  | 6 +++---
 tests/data-plane/vcr/docker-compose-otel.yaml | 2 +-
 tests/data-plane/vcr/docker-compose.yaml      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fcd8b683ef..326d1bd989 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ARG VARIANT=static
 ARG COMMAND_NAME
 
 # Base image configuration
-ARG GOLANG_BASE_IMAGE=golang:1.25
+ARG GOLANG_BASE_IMAGE=golang:1.26
 ARG RUNTIME_BASE_IMAGE=gcr.io/distroless/${VARIANT}-debian12:nonroot
 
 # Pre-download Envoy for aigw using func-e. This reduces latency and avoids
diff --git a/cmd/aigw/docker-compose.yaml b/cmd/aigw/docker-compose.yaml
index 6c5d6be1ed..1e4d719355 100644
--- a/cmd/aigw/docker-compose.yaml
+++ b/cmd/aigw/docker-compose.yaml
@@ -63,7 +63,7 @@ services:
 
   # chat-completion is a simple curl-based test client for sending requests to aigw.
   chat-completion:
-    image: golang:1.25
+    image: golang:1.26
     container_name: chat-completion
     profiles: ["test"]
     env_file:
@@ -87,7 +87,7 @@ services:
 
   # completion is a simple curl-based test client for sending completion requests to aigw.
   completion:
-    image: golang:1.25
+    image: golang:1.26
     container_name: completion
     profiles: ["test"]
     env_file:
@@ -111,7 +111,7 @@ services:
 
   # embeddings is a simple curl-based test client for sending embeddings requests to aigw.
   embeddings:
-    image: golang:1.25
+    image: golang:1.26
     container_name: embeddings
     profiles: ["test"]
     env_file:
diff --git a/tests/data-plane/vcr/docker-compose-otel.yaml b/tests/data-plane/vcr/docker-compose-otel.yaml
index a879767eb8..759bf6dc97 100644
--- a/tests/data-plane/vcr/docker-compose-otel.yaml
+++ b/tests/data-plane/vcr/docker-compose-otel.yaml
@@ -8,7 +8,7 @@ volumes:
 
 services:
   extproc-build:
-    image: golang:1.25
+    image: golang:1.26
     container_name: extproc-build
     working_dir: /workspace
     volumes:
diff --git a/tests/data-plane/vcr/docker-compose.yaml b/tests/data-plane/vcr/docker-compose.yaml
index 54d872213e..493350b1de 100644
--- a/tests/data-plane/vcr/docker-compose.yaml
+++ b/tests/data-plane/vcr/docker-compose.yaml
@@ -9,7 +9,7 @@ volumes:
 
 services:
   extproc-build:
-    image: golang:1.25
+    image: golang:1.26
     container_name: extproc-build
     working_dir: /workspace
     volumes:
@@ -66,7 +66,7 @@ services:
     command: ["envoy", "-c", "/etc/envoy/envoy.yaml", "--log-level", "debug"]
 
   openai-client:
-    image: golang:1.25
+    image: golang:1.26
     container_name: openai-client
     profiles: ["test"]
     env_file: