diff --git a/build/common.sh b/build/common.sh index a3297965ea1..0ae42f4e15b 100755 --- a/build/common.sh +++ b/build/common.sh @@ -99,7 +99,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.6.2 readonly __default_go_runner_version=v2.3.1-go1.23.0-bookworm.0 -readonly __default_setcap_version=bookworm-v1.0.3 +readonly __default_setcap_version=bookworm-v1.0.4 # 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 c1df09d003e..b6934814bf4 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -144,7 +144,7 @@ dependencies: # Base images - name: "registry.k8s.io/debian-base: dependents" - version: bookworm-v1.0.3 + version: bookworm-v1.0.4 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-]+)*))?) @@ -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.3 + version: bookworm-v1.0.4 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 3e04dc52d6b..aac0d975ae8 100755 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3214,7 +3214,7 @@ spec: - name: vol containers: - name: pv-recycler - image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3 + image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.4 command: - /bin/sh args: diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 0e9b675dd3e..7f6aad22d2f 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.3 + BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4 endif ifeq ($(ARCH),arm) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 endif ifeq ($(ARCH),arm64) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 endif ifeq ($(ARCH),ppc64le) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 endif ifeq ($(ARCH),s390x) - BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3 + BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4 endif BASE.windows = mcr.microsoft.com/windows/nanoserver diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 8c9e7584bda..7f93a103bf1 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -984,7 +984,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod { Containers: []v1.Container{ { Name: "pv-recycler", - Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3", + Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.4", 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/test/conformance/image/Makefile b/test/conformance/image/Makefile index 3fcd83df233..17f84faa2ff 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.3 +BASE_IMAGE_VERSION?=bookworm-v1.0.4 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/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index fa0e707f8db..5c683ef4c68 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.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 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4 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 ce1a52b92fb..880445d9c10 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.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 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4 diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE index 06a59e5bc9d..1e453bde46e 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.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/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE index 06a59e5bc9d..1e453bde46e 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.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/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 diff --git a/test/images/regression-issue-74839/BASEIMAGE b/test/images/regression-issue-74839/BASEIMAGE index ce1a52b92fb..880445d9c10 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.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 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index fa0e707f8db..5c683ef4c68 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.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 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022