From a3b193c6e95d76b8a60ff59c38d0e615f2405dc3 Mon Sep 17 00:00:00 2001 From: cpanato Date: Thu, 6 Jun 2024 18:13:03 +0200 Subject: [PATCH] [go] Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base Signed-off-by: cpanato --- .go-version | 2 +- build/build-image/cross/VERSION | 2 +- build/common.sh | 6 +++--- build/dependencies.yaml | 12 ++++++------ cluster/gce/gci/configure-helper.sh | 2 +- cluster/images/etcd/Makefile | 10 +++++----- pkg/volume/plugins.go | 2 +- staging/publishing/rules.yaml | 2 +- test/conformance/image/Makefile | 2 +- test/images/Makefile | 2 +- test/images/nonroot/BASEIMAGE | 10 +++++----- test/images/pets/peer-finder/BASEIMAGE | 10 +++++----- test/images/pets/redis-installer/BASEIMAGE | 8 ++++---- test/images/pets/zookeeper-installer/BASEIMAGE | 8 ++++---- test/images/regression-issue-74839/BASEIMAGE | 10 +++++----- test/images/resource-consumer/BASEIMAGE | 10 +++++----- test/utils/image/manifest.go | 2 +- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.go-version b/.go-version index 98f7da137ce..be02b337a74 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.3 \ No newline at end of file +1.22.4 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 05500a7452e..ddad271b5b9 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.31.0-go1.22.3-bullseye.0 +v1.31.0-go1.22.4-bullseye.0 diff --git a/build/common.sh b/build/common.sh index 5d0e268a581..886f5508265 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,9 +97,9 @@ 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.4 -readonly __default_go_runner_version=v2.3.1-go1.22.3-bookworm.0 -readonly __default_setcap_version=bookworm-v1.0.2 +readonly __default_distroless_iptables_version=v0.5.5 +readonly __default_go_runner_version=v2.3.1-go1.22.4-bookworm.0 +readonly __default_setcap_version=bookworm-v1.0.3 # These are the base images for the Docker-wrapped binaries. readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}" diff --git a/build/dependencies.yaml b/build/dependencies.yaml index f64d98c0b6a..d6ec9c1d512 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.22.3 + version: 1.22.4 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -138,13 +138,13 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.31.0-go1.22.3-bullseye.0 + version: v1.31.0-go1.22.4-bullseye.0 refPaths: - path: build/build-image/cross/VERSION # Base images - name: "registry.k8s.io/debian-base: dependents" - version: bookworm-v1.0.2 + version: bookworm-v1.0.3 refPaths: - path: cluster/images/etcd/Makefile match: BASEIMAGE\?\=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-]+)*))?) @@ -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.4 + version: v0.5.5 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.3-bookworm.0 + version: v2.3.1-go1.22.4-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= @@ -244,7 +244,7 @@ dependencies: match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} - name: "registry.k8s.io/build-image/setcap: dependents" - version: bookworm-v1.0.2 + version: bookworm-v1.0.3 refPaths: - path: build/common.sh match: __default_setcap_version= diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 9b5ebf94029..b5b34bca549 100755 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3186,7 +3186,7 @@ spec: - name: vol containers: - name: pv-recycler - image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.2 + image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3 command: - /bin/sh args: diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index e809f8c852e..144240addb0 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows DOCKERFILE := ${DOCKERFILE.${OS}} ifeq ($(ARCH),amd64) - BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2 + BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3 endif ifeq ($(ARCH),arm) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3 endif BASE.windows = mcr.microsoft.com/windows/nanoserver diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 981d8462b01..4152bffb43b 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -997,7 +997,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod { Containers: []v1.Container{ { Name: "pv-recycler", - Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.2", + Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3", Command: []string{"/bin/sh"}, Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"}, VolumeMounts: []v1.VolumeMount{ diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index fec62c76987..e6893eafe4c 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2873,4 +2873,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.22.3 +default-go-version: 1.22.4 diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index 10a927b6e69..3fcd83df233 100644 --- a/test/conformance/image/Makefile +++ b/test/conformance/image/Makefile @@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/ # This is defined in root Makefile, but some build contexts do not refer to them KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io -BASE_IMAGE_VERSION?=bookworm-v1.0.2 +BASE_IMAGE_VERSION?=bookworm-v1.0.3 RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX) diff --git a/test/images/Makefile b/test/images/Makefile index fe4ea86ab1c..f1025738f6d 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.3 +GOLANG_VERSION=1.22.4 export ifndef WHAT diff --git a/test/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index baee43087f7..fa0e707f8db 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -1,7 +1,7 @@ -linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 -linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 -linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 -linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 -linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE index 58b62319e50..ce1a52b92fb 100644 --- a/test/images/pets/peer-finder/BASEIMAGE +++ b/test/images/pets/peer-finder/BASEIMAGE @@ -1,5 +1,5 @@ -linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 -linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 -linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 -linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 -linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3 diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE index 6b7e602eec6..06a59e5bc9d 100644 --- a/test/images/pets/redis-installer/BASEIMAGE +++ b/test/images/pets/redis-installer/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 -linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 -linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 -linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE index 6b7e602eec6..06a59e5bc9d 100644 --- a/test/images/pets/zookeeper-installer/BASEIMAGE +++ b/test/images/pets/zookeeper-installer/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 -linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 -linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 -linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 diff --git a/test/images/regression-issue-74839/BASEIMAGE b/test/images/regression-issue-74839/BASEIMAGE index 58b62319e50..ce1a52b92fb 100644 --- a/test/images/regression-issue-74839/BASEIMAGE +++ b/test/images/regression-issue-74839/BASEIMAGE @@ -1,5 +1,5 @@ -linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 -linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 -linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 -linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 -linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index baee43087f7..fa0e707f8db 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -1,7 +1,7 @@ -linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.2 -linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.2 -linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.2 -linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.2 -linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.2 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 744474d68cd..b5e375982f3 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -235,7 +235,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.4"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.5"} 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"}