From 0e9308f3bccf47a7430c5b7252e3ccd427d4668d Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 4 Jul 2024 16:34:18 +0200 Subject: [PATCH] Bump images, dependencies and versions to go 1.22.5 and distroless iptables Signed-off-by: cpanato --- .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 be02b337a74..054c858fbf3 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.4 \ No newline at end of file +1.22.5 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index ddad271b5b9..58c49555cb7 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.31.0-go1.22.4-bullseye.0 +v1.31.0-go1.22.5-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 886f5508265..94b5492f296 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.5.5 -readonly __default_go_runner_version=v2.3.1-go1.22.4-bookworm.0 +readonly __default_distroless_iptables_version=v0.5.6 +readonly __default_go_runner_version=v2.3.1-go1.22.5-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.3 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index d6ec9c1d512..83a1bd6eb85 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.22.4 + version: 1.22.5 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -138,7 +138,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.31.0-go1.22.4-bullseye.0 + version: v1.31.0-go1.22.5-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -176,7 +176,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.5.5 + version: v0.5.6 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -184,7 +184,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.3.1-go1.22.4-bookworm.0 + version: v2.3.1-go1.22.5-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 f19482409d4..fd131f5a16f 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2421,4 +2421,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.22.4 +default-go-version: 1.22.5 diff --git a/test/images/Makefile b/test/images/Makefile index f1025738f6d..56bbb67fd63 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.22.4 +GOLANG_VERSION=1.22.5 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 76067e103bb..cbe554a5043 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -229,7 +229,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.5"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.6"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.14-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}