From a4cc2ce4c2ee27c41447bd0154630a7a4654d895 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Wed, 1 Apr 2026 13:38:17 -0400 Subject: [PATCH] Bump to go 1.25 --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 ++-- build/dependencies.yaml | 12 ++++++------ test/utils/image/manifest.go | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index 59b05446606..e6a6e7cd3e9 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.13 +1.25.8 diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index d46c0fbbb94..ffeb3d19d52 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.33.0-go1.24.13-bullseye.0 +v1.33.0-go1.25.8-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 92a0014e867..8c73ceb9245 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,8 +97,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}" readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. -readonly __default_distroless_iptables_version=v0.7.15 -readonly __default_go_runner_version=v2.4.0-go1.24.13-bookworm.0 +readonly __default_distroless_iptables_version=v0.8.8 +readonly __default_go_runner_version=v2.4.0-go1.25.8-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.6 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 0806c4b5537..e01c84876ab 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -117,14 +117,14 @@ dependencies: # pass when building Kubernetes using a pre-release of Golang. - name: "golang: 1." - version: 1.24 + version: 1.25 refPaths: - path: build/build-image/cross/VERSION - - path: hack/lib/golang.sh - match: minimum_go_version=go([0-9]+\.[0-9]+) + # - path: hack/lib/golang.sh + # match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.33.0-go1.24.13-bullseye.0 + version: v1.33.0-go1.25.8-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -162,7 +162,7 @@ dependencies: match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - name: "registry.k8s.io/distroless-iptables: dependents" - version: v0.7.15 + version: v0.8.8 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -170,7 +170,7 @@ dependencies: match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"} - name: "registry.k8s.io/go-runner: dependents" - version: v2.4.0-go1.24.13-bookworm.0 + version: v2.4.0-go1.25.8-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 8eea1b89336..fe7be58390b 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -228,7 +228,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"} configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.15"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.8.8"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.21-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}