From a5861a1262666573d074108f6259c1ac5cf61019 Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 11 Jan 2024 10:24:54 +0100 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.21.6 and distroless iptables to 0.4.4 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/conformance/testdata/repo_list_images.txt | 2 +- test/images/Makefile | 2 +- test/utils/image/manifest.go | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.go-version b/.go-version index d6a49eb3732..6e83421e4fd 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.5 \ No newline at end of file +1.21.6 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 07775bb02b9..c30b6cb6d2a 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.29.0-go1.21.5-bullseye.0 +v1.30.0-go1.21.6-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 803cddddafc..bd6a01a2074 100755 --- a/build/common.sh +++ b/build/common.sh @@ -96,8 +96,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.4.3 -readonly __default_go_runner_version=v2.3.1-go1.21.5-bookworm.0 +readonly __default_distroless_iptables_version=v0.4.4 +readonly __default_go_runner_version=v2.3.1-go1.21.6-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 3121d33c703..1a8f74ff222 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -118,7 +118,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.21.5 + version: 1.21.6 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -140,7 +140,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.29.0-go1.21.5-bullseye.0 + version: v1.30.0-go1.21.6-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -178,7 +178,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.4.3 + version: v0.4.4 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -186,7 +186,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.21.5-bookworm.0 + version: v2.3.1-go1.21.6-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 b10dc7c8705..4e303420fc4 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2392,4 +2392,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.21.5 +default-go-version: 1.21.6 diff --git a/test/conformance/testdata/repo_list_images.txt b/test/conformance/testdata/repo_list_images.txt index 93509cb0614..dda251315b0 100644 --- a/test/conformance/testdata/repo_list_images.txt +++ b/test/conformance/testdata/repo_list_images.txt @@ -2,7 +2,7 @@ gcr.io/authenticated-image-pulling/alpine:3.7 gcr.io/authenticated-image-pulling/windows-nanoserver:v1 gcr.io/k8s-authenticated-test/agnhost:2.6 invalid.registry.k8s.io/invalid/alpine:3.1 -registry.k8s.io/build-image/distroless-iptables:v0.4.3 +registry.k8s.io/build-image/distroless-iptables:v0.4.4 registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.2.2 registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.4.0 registry.k8s.io/e2e-test-images/agnhost:2.45 diff --git a/test/images/Makefile b/test/images/Makefile index 85f79e156da..92e854649d5 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.21.5 +GOLANG_VERSION=1.21.6 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 5fc4ba32315..236ed99a82b 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -237,7 +237,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.4.3"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.4.4"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.11-0"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}