From e467c9530b80123d194e6f5e4d0db38503ed2a51 Mon Sep 17 00:00:00 2001 From: Arnaud Meukam Date: Fri, 18 Apr 2025 15:49:48 +0200 Subject: [PATCH] [Go] Bump dependencies, images and versions used to Go 1.24.2 and distroless-iptables Signed-off-by: Arnaud Meukam --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 ++-- build/dependencies.yaml | 8 ++++---- staging/publishing/rules.yaml | 2 +- test/images/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index 53cc1a6f929..e4a973f913f 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.0 +1.24.2 diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 8f02aa6952d..83d855c8a70 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.33.0-go1.24.0-bullseye.0 +v1.33.0-go1.24.2-bullseye.0 diff --git a/build/common.sh b/build/common.sh index dc209bf9300..65e93430df0 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.3 -readonly __default_go_runner_version=v2.4.0-go1.24.0-bookworm.0 +readonly __default_distroless_iptables_version=v0.7.4 +readonly __default_go_runner_version=v2.4.0-go1.24.2-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.4 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index c7d37db5e19..9f20b1ca97a 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.24.0 + version: 1.24.2 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -139,7 +139,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.33.0-go1.24.0-bullseye.0 + version: v1.33.0-go1.24.2-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -177,7 +177,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.3 + version: v0.7.4 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -185,7 +185,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.0-bookworm.0 + version: v2.4.0-go1.24.2-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 148d32fe92f..0d6c29ee8b5 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2901,4 +2901,4 @@ rules: - staging/src/k8s.io/externaljwt recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.24.0 +default-go-version: 1.24.2 diff --git a/test/images/Makefile b/test/images/Makefile index 6e444b584f7..8b2d91ee212 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.24.0 +GOLANG_VERSION=1.24.2 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index da3fe4933e6..6d0d44f92a9 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -223,7 +223,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.3"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.4"} 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"}