Skip to content

Commit d43e670

Browse files
authored
Merge pull request kubernetes#119095 from saschagrunert/debian-base-bookworm
Update debian-base to bookworm
2 parents f6bcef0 + 5e1777b commit d43e670

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ dependencies:
142142

143143
# Base images
144144
- name: "registry.k8s.io/debian-base: dependents"
145-
version: bullseye-v1.4.2
145+
version: bookworm-v1.0.0
146146
refPaths:
147147
- path: cluster/images/etcd/Makefile
148148
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-]+)*))?)

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:bullseye-v1.4.2
95+
BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.0
9696
endif
9797
ifeq ($(ARCH),arm)
98-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.4.2
98+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
9999
endif
100100
ifeq ($(ARCH),arm64)
101-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.4.2
101+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
102102
endif
103103
ifeq ($(ARCH),ppc64le)
104-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.4.2
104+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
105105
endif
106106
ifeq ($(ARCH),s390x)
107-
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.4.2
107+
BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
108108
endif
109109

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

test/conformance/image/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ FROM ${RUNNERIMAGE}
2121

2222
# This is a dependency for `kubectl diff` tests
2323
COPY --from=debbase /usr/bin/diff /usr/local/bin/
24+
COPY --from=debbase /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu
25+
COPY --from=debbase /lib/x86_64-linux-gnu/libpthread.so.0 /lib/x86_64-linux-gnu
26+
COPY --from=debbase /lib64/ld-linux-x86-64.so.2 /lib64
2427

2528
COPY cluster /kubernetes/cluster
2629
COPY ginkgo /usr/local/bin/

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?=bullseye-v1.4.2
36+
BASE_IMAGE_VERSION?=bookworm-v1.0.0
3737
BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
3838

3939
# Keep debian releases (e.g. debian 11 == bullseye) consistent

0 commit comments

Comments
 (0)