From 8472ef67acbd85935e0e3bfc503858436f7b3e83 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:07:12 +0200
Subject: [PATCH 1/2] update to go 1.25

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 .github/workflows/build.yml             | 4 ++--
 .github/workflows/codeql.yml            | 2 +-
 Dockerfile                              | 4 ++--
 hack/dockerfiles/docs.Dockerfile        | 2 +-
 hack/dockerfiles/govulncheck.Dockerfile | 2 +-
 hack/dockerfiles/lint.Dockerfile        | 2 +-
 hack/dockerfiles/vendor.Dockerfile      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b764fd20f73..accfc9964d34 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,8 +36,8 @@ env:
   TEST_CACHE_SCOPE: "test"
   TESTFLAGS: "-v --parallel=6 --timeout=30m"
   GOTESTSUM_FORMAT: "standard-verbose"
-  GO_VERSION: "1.24"
-  GOTESTSUM_VERSION: "v1.12.0"  # same as one in Dockerfile
+  GO_VERSION: "1.25"
+  GOTESTSUM_VERSION: "v1.13.0"  # same as one in Dockerfile
 
 jobs:
   test-integration:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e7090d51b80a..cbf6a7b67211 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -17,7 +17,7 @@ on:
   pull_request:
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
 
 jobs:
   codeql:
diff --git a/Dockerfile b/Dockerfile
index 92954c268e8b..03f140424b31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.24
+ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
 ARG XX_VERSION=1.6.1
 
@@ -9,7 +9,7 @@ ARG DOCKER_VERSION=28.4
 ARG DOCKER_VERSION_ALT_27=27.5.1
 ARG DOCKER_VERSION_ALT_26=26.1.3
 ARG DOCKER_CLI_VERSION=${DOCKER_VERSION}
-ARG GOTESTSUM_VERSION=v1.12.0
+ARG GOTESTSUM_VERSION=v1.13.0
 ARG REGISTRY_VERSION=3.0.0
 ARG BUILDKIT_VERSION=v0.25.0
 ARG COMPOSE_VERSION=v2.39.1
diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile
index 13cfb028c82a..d0a15938c706 100644
--- a/hack/dockerfiles/docs.Dockerfile
+++ b/hack/dockerfiles/docs.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.24
+ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
 
 ARG FORMATS=md,yaml
diff --git a/hack/dockerfiles/govulncheck.Dockerfile b/hack/dockerfiles/govulncheck.Dockerfile
index ee22125ef292..a482ef18432f 100644
--- a/hack/dockerfiles/govulncheck.Dockerfile
+++ b/hack/dockerfiles/govulncheck.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.24
+ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
 
 ARG GOVULNCHECK_VERSION=v1.1.4
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
index db35f3ac7ae4..20cfe07675a9 100644
--- a/hack/dockerfiles/lint.Dockerfile
+++ b/hack/dockerfiles/lint.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.24
+ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
 ARG XX_VERSION=1.6.1
 
diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile
index 644137e7f586..172218511127 100644
--- a/hack/dockerfiles/vendor.Dockerfile
+++ b/hack/dockerfiles/vendor.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.24
+ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
 
 ARG MODOUTDATED_VERSION=v0.9.0

From 729996e8d110de475a03d473ae77dcf3fe3453a8 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 13 Oct 2025 13:07:45 +0200
Subject: [PATCH 2/2] dockerfile: update xx to 1.7.0

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 Dockerfile                       | 2 +-
 hack/dockerfiles/lint.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03f140424b31..b1a9bca44c10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
-ARG XX_VERSION=1.6.1
+ARG XX_VERSION=1.7.0
 
 # for testing
 ARG DOCKER_VERSION=28.4
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
index 20cfe07675a9..405babf41682 100644
--- a/hack/dockerfiles/lint.Dockerfile
+++ b/hack/dockerfiles/lint.Dockerfile
@@ -2,7 +2,7 @@
 
 ARG GO_VERSION=1.25
 ARG ALPINE_VERSION=3.22
-ARG XX_VERSION=1.6.1
+ARG XX_VERSION=1.7.0
 
 ARG GOLANGCI_LINT_VERSION=v2.1.5
 ARG GOLANGCI_FROM_SOURCE=false