diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 08c2849f36b..311758d8d1b 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -158,6 +158,22 @@ dependencies: match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-s390x:[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-]+)*))?) - path: test/conformance/image/Makefile match: BASE_IMAGE_VERSION\?= + - path: test/images/pets/peer-finder/BASEIMAGE + match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?) + - path: test/images/resource-consumer/BASEIMAGE + match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?) + - path: test/images/pets/zookeeper-installer/BASEIMAGE + match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?) + - path: test/images/nonroot/BASEIMAGE + match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?) + - path: test/images/regression-issue-74839/BASEIMAGE + match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?) + - path: test/images/pets/redis-installer/BASEIMAGE + match: registry\.k8s\.io\/build-image\/debian-base-amd64:[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-]+)*))?) + - path: cluster/gce/gci/configure-helper.sh + 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-]+)*))?) + - path: pkg/volume/plugins.go + 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.3.2 diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 4182e8ab38d..a2f64c3d84e 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -3111,7 +3111,7 @@ spec: - name: vol containers: - name: pv-recycler - image: registry.k8s.io/debian-base:v2.0.0 + image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.0 command: - /bin/sh args: diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 0b7b4e87e1c..14cee160a63 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -1057,7 +1057,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod { Containers: []v1.Container{ { Name: "pv-recycler", - Image: "registry.k8s.io/debian-base:v2.0.0", + Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.0", 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/images/nonroot/BASEIMAGE b/test/images/nonroot/BASEIMAGE index d920620cbb5..f9cc88bb40c 100644 --- a/test/images/nonroot/BASEIMAGE +++ b/test/images/nonroot/BASEIMAGE @@ -1,7 +1,7 @@ -linux/amd64=registry.k8s.io/debian-base-amd64:v1.0.0 -linux/arm=registry.k8s.io/debian-base-arm:v1.0.0 -linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0 -linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0 -linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/nonroot/VERSION b/test/images/nonroot/VERSION index c068b2447cc..c239c60cba2 100644 --- a/test/images/nonroot/VERSION +++ b/test/images/nonroot/VERSION @@ -1 +1 @@ -1.4 +1.5 diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE index fc3cc7c5f2a..d65734c24b2 100644 --- a/test/images/pets/peer-finder/BASEIMAGE +++ b/test/images/pets/peer-finder/BASEIMAGE @@ -1,5 +1,5 @@ -linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 -linux/arm=registry.k8s.io/debian-base-arm:0.4.1 -linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 -linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 -linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0 diff --git a/test/images/pets/peer-finder/VERSION b/test/images/pets/peer-finder/VERSION index 810ee4e91e2..d3bdbdf1fda 100644 --- a/test/images/pets/peer-finder/VERSION +++ b/test/images/pets/peer-finder/VERSION @@ -1 +1 @@ -1.6 +1.7 diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE index b4d573c09f8..60e400b03b7 100644 --- a/test/images/pets/redis-installer/BASEIMAGE +++ b/test/images/pets/redis-installer/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 -linux/arm=registry.k8s.io/debian-base-arm:0.4.1 -linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 -linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0 diff --git a/test/images/pets/redis-installer/VERSION b/test/images/pets/redis-installer/VERSION index c239c60cba2..810ee4e91e2 100644 --- a/test/images/pets/redis-installer/VERSION +++ b/test/images/pets/redis-installer/VERSION @@ -1 +1 @@ -1.5 +1.6 diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE index b4d573c09f8..60e400b03b7 100644 --- a/test/images/pets/zookeeper-installer/BASEIMAGE +++ b/test/images/pets/zookeeper-installer/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 -linux/arm=registry.k8s.io/debian-base-arm:0.4.1 -linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 -linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0 diff --git a/test/images/pets/zookeeper-installer/VERSION b/test/images/pets/zookeeper-installer/VERSION index c239c60cba2..810ee4e91e2 100644 --- a/test/images/pets/zookeeper-installer/VERSION +++ b/test/images/pets/zookeeper-installer/VERSION @@ -1 +1 @@ -1.5 +1.6 diff --git a/test/images/regression-issue-74839/BASEIMAGE b/test/images/regression-issue-74839/BASEIMAGE index 4115c154df2..d65734c24b2 100644 --- a/test/images/regression-issue-74839/BASEIMAGE +++ b/test/images/regression-issue-74839/BASEIMAGE @@ -1,5 +1,5 @@ -linux/amd64=registry.k8s.io/debian-base-amd64:v1.0.0 -linux/arm=registry.k8s.io/debian-base-arm:v1.0.0 -linux/arm64=registry.k8s.io/debian-base-arm64:v1.0.0 -linux/ppc64le=registry.k8s.io/debian-base-ppc64le:v1.0.0 -linux/s390x=registry.k8s.io/debian-base-s390x:v1.0.0 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0 diff --git a/test/images/regression-issue-74839/VERSION b/test/images/regression-issue-74839/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/regression-issue-74839/VERSION +++ b/test/images/regression-issue-74839/VERSION @@ -1 +1 @@ -1.2 +1.3 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index 85dba0c124d..f9cc88bb40c 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -1,7 +1,7 @@ -linux/amd64=registry.k8s.io/debian-base-amd64:0.4.1 -linux/arm=registry.k8s.io/debian-base-arm:0.4.1 -linux/arm64=registry.k8s.io/debian-base-arm64:0.4.1 -linux/ppc64le=registry.k8s.io/debian-base-ppc64le:0.4.1 -linux/s390x=registry.k8s.io/debian-base-s390x:0.4.1 +linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.0 +linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0 +linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0 +linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0 +linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/test/images/resource-consumer/VERSION b/test/images/resource-consumer/VERSION index d3456a90f7d..63738cc28dc 100644 --- a/test/images/resource-consumer/VERSION +++ b/test/images/resource-consumer/VERSION @@ -1 +1 @@ -1.13 +1.14