Skip to content

Commit e09c28e

Browse files
cpanatocpanato
committed
update debian-base and setcap to bookworm-v1.0.4
Signed-off-by: cpanato <[email protected]>
1 parent 0e4cf67 commit e09c28e

File tree

12 files changed

+39
-39
lines changed

12 files changed

+39
-39
lines changed

‎build/common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
9999
# These are the default versions (image tags) for their respective base images.
100100
readonly __default_distroless_iptables_version=v0.6.2
101101
readonly __default_go_runner_version=v2.3.1-go1.23.0-bookworm.0
102-
readonly __default_setcap_version=bookworm-v1.0.3
102+
readonly __default_setcap_version=bookworm-v1.0.4
103103

104104
# These are the base images for the Docker-wrapped binaries.
105105
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"

‎build/dependencies.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ dependencies:
144144

145145
# Base images
146146
- name: "registry.k8s.io/debian-base: dependents"
147-
version: bookworm-v1.0.3
147+
version: bookworm-v1.0.4
148148
refPaths:
149149
- path: cluster/images/etcd/Makefile
150150
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:
244244
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
245245

246246
- name: "registry.k8s.io/build-image/setcap: dependents"
247-
version: bookworm-v1.0.3
247+
version: bookworm-v1.0.4
248248
refPaths:
249249
- path: build/common.sh
250250
match: __default_setcap_version=

‎cluster/gce/gci/configure-helper.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3214,7 +3214,7 @@ spec:
32143214
- name: vol
32153215
containers:
32163216
- name: pv-recycler
3217-
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
3217+
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
32183218
command:
32193219
- /bin/sh
32203220
args:

‎cluster/images/etcd/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
9292
DOCKERFILE := ${DOCKERFILE.${OS}}
9393

9494
ifeq ($(ARCH),amd64)
95-
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
95+
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
9696
endif
9797
ifeq ($(ARCH),arm)
98-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
98+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
9999
endif
100100
ifeq ($(ARCH),arm64)
101-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
101+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
102102
endif
103103
ifeq ($(ARCH),ppc64le)
104-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
104+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
105105
endif
106106
ifeq ($(ARCH),s390x)
107-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
107+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4
108108
endif
109109

110110
BASE.windows = mcr.microsoft.com/windows/nanoserver

‎pkg/volume/plugins.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ func NewPersistentVolumeRecyclerPodTemplate() *v1.Pod {
984984
Containers: []v1.Container{
985985
{
986986
Name: "pv-recycler",
987-
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.3",
987+
Image: "registry.k8s.io/build-image/debian-base:bookworm-v1.0.4",
988988
Command: []string{"/bin/sh"},
989989
Args: []string{"-c", "test -e /scrub && find /scrub -mindepth 1 -delete && test -z \"$(ls -A /scrub)\" || exit 1"},
990990
VolumeMounts: []v1.VolumeMount{

‎test/conformance/image/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
3333

3434
# This is defined in root Makefile, but some build contexts do not refer to them
3535
KUBE_BASE_IMAGE_REGISTRY?=registry.k8s.io
36-
BASE_IMAGE_VERSION?=bookworm-v1.0.3
36+
BASE_IMAGE_VERSION?=bookworm-v1.0.4
3737
RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
3838

3939
TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX)

‎test/images/nonroot/BASEIMAGE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
5-
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
5+
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4
66
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
77
windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022

‎test/images/pets/peer-finder/BASEIMAGE‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
5-
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.3
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4
5+
linux/s390x=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.4

‎test/images/pets/redis-installer/BASEIMAGE‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4

‎test/images/pets/zookeeper-installer/BASEIMAGE‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.3
2-
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.3
3-
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.3
4-
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.3
1+
linux/amd64=registry.k8s.io/build-image/debian-base-amd64:bookworm-v1.0.4
2+
linux/arm=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.4
3+
linux/arm64=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.4
4+
linux/ppc64le=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.4

0 commit comments

Comments
 (0)