From 45feeb6a04a57febeb15818ada8e92589585f069 Mon Sep 17 00:00:00 2001 From: Carlos Panato Date: Fri, 5 Dec 2025 11:47:07 +0100 Subject: [PATCH] Bump dependencies, images and versions used to Go 1.24.11 and distroless iptables Signed-off-by: Carlos Panato --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 4 +-- build/dependencies.yaml | 8 ++--- staging/publishing/rules.yaml | 64 ++++++++++++++++----------------- test/images/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/.go-version b/.go-version index c4bdc90e96d..d6c68ad2d09 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.10 +1.24.11 diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index de68bdf373a..b12c1e991d3 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.33.0-go1.24.10-bullseye.0 +v1.33.0-go1.24.11-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 83bfc91ea19..c94fede8395 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.12 -readonly __default_go_runner_version=v2.4.0-go1.24.10-bookworm.0 +readonly __default_distroless_iptables_version=v0.7.13 +readonly __default_go_runner_version=v2.4.0-go1.24.11-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 b92f7ff2117..4ce58f6d933 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -112,7 +112,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.24.10 + version: 1.24.11 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -135,7 +135,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.33.0-go1.24.10-bullseye.0 + version: v1.33.0-go1.24.11-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -173,7 +173,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.12 + version: v0.7.13 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -181,7 +181,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.10-bookworm.0 + version: v2.4.0-go1.24.11-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 2f5f5105752..b389345cba0 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -30,7 +30,7 @@ rules: dirs: - staging/src/k8s.io/apimachinery - name: release-1.33 - go: 1.24.0 + go: 1.24.11 source: branch: release-1.33 dirs: @@ -82,7 +82,7 @@ rules: dirs: - staging/src/k8s.io/api - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -167,7 +167,7 @@ rules: go build -mod=mod ./... go test -mod=mod ./... - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -225,7 +225,7 @@ rules: dirs: - staging/src/k8s.io/code-generator - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -299,7 +299,7 @@ rules: dirs: - staging/src/k8s.io/component-base - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -378,7 +378,7 @@ rules: dirs: - staging/src/k8s.io/component-helpers - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -437,7 +437,7 @@ rules: dirs: - staging/src/k8s.io/kms - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -532,7 +532,7 @@ rules: dirs: - staging/src/k8s.io/apiserver - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -655,7 +655,7 @@ rules: dirs: - staging/src/k8s.io/kube-aggregator - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -806,7 +806,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -932,7 +932,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -1067,7 +1067,7 @@ rules: required-packages: - k8s.io/code-generator - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -1165,7 +1165,7 @@ rules: dirs: - staging/src/k8s.io/metrics - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -1246,7 +1246,7 @@ rules: dirs: - staging/src/k8s.io/cli-runtime - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -1335,7 +1335,7 @@ rules: dirs: - staging/src/k8s.io/sample-cli-plugin - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -1425,7 +1425,7 @@ rules: dirs: - staging/src/k8s.io/kube-proxy - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -1471,7 +1471,7 @@ rules: dirs: - staging/src/k8s.io/cri-api - name: release-1.33 - go: 1.24.0 + go: 1.24.11 source: branch: release-1.33 dirs: @@ -1529,7 +1529,7 @@ rules: dirs: - staging/src/k8s.io/cri-client - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -1652,7 +1652,7 @@ rules: dirs: - staging/src/k8s.io/kubelet - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -1749,7 +1749,7 @@ rules: dirs: - staging/src/k8s.io/kube-scheduler - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -1860,7 +1860,7 @@ rules: dirs: - staging/src/k8s.io/controller-manager - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -1995,7 +1995,7 @@ rules: dirs: - staging/src/k8s.io/cloud-provider - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -2144,7 +2144,7 @@ rules: dirs: - staging/src/k8s.io/kube-controller-manager - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -2225,7 +2225,7 @@ rules: dirs: - staging/src/k8s.io/cluster-bootstrap - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -2292,7 +2292,7 @@ rules: dirs: - staging/src/k8s.io/csi-translation-lib - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -2334,7 +2334,7 @@ rules: dirs: - staging/src/k8s.io/mount-utils - name: release-1.33 - go: 1.24.0 + go: 1.24.11 source: branch: release-1.33 dirs: @@ -2509,7 +2509,7 @@ rules: dirs: - staging/src/k8s.io/kubectl - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -2628,7 +2628,7 @@ rules: dirs: - staging/src/k8s.io/pod-security-admission - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -2767,7 +2767,7 @@ rules: dirs: - staging/src/k8s.io/dynamic-resource-allocation - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: apimachinery branch: release-1.33 @@ -2867,7 +2867,7 @@ rules: dirs: - staging/src/k8s.io/endpointslice - name: release-1.33 - go: 1.24.0 + go: 1.24.11 dependencies: - repository: api branch: release-1.33 @@ -2894,11 +2894,11 @@ rules: dirs: - staging/src/k8s.io/externaljwt - name: release-1.33 - go: 1.24.0 + go: 1.24.11 source: branch: release-1.33 dirs: - staging/src/k8s.io/externaljwt recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.24.10 +default-go-version: 1.24.11 diff --git a/test/images/Makefile b/test/images/Makefile index 70e40d57d2b..32f75796e25 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.10 +GOLANG_VERSION=1.24.11 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 8613613e2f0..60685930684 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.12"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.13"} 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"}