Merge pull request kubernetes#119095 from saschagrunert/debian-base-b…

…ookworm Update debian-base to bookworm
openshift · Jul 18, 2023 · d43e670 · d43e670
2 parents f6bcef0 + 5e1777b
commit d43e670
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
@@ -142,7 +142,7 @@ dependencies:
 
   # Base images
   - name: "registry.k8s.io/debian-base: dependents"
-    version: bullseye-v1.4.2
+    version: bookworm-v1.0.0
     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-]+)*))?)

diff --git 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:bullseye-v1.4.2
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base:bookworm-v1.0.0
 endif
 ifeq ($(ARCH),arm)
-    BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.4.2
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bookworm-v1.0.0
 endif
 ifeq ($(ARCH),arm64)
-    BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.4.2
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bookworm-v1.0.0
 endif
 ifeq ($(ARCH),ppc64le)
-    BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.4.2
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bookworm-v1.0.0
 endif
 ifeq ($(ARCH),s390x)
-    BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.4.2
+    BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bookworm-v1.0.0
 endif
 
 BASE.windows = mcr.microsoft.com/windows/nanoserver

diff --git a/test/conformance/image/Dockerfile b/test/conformance/image/Dockerfile
@@ -21,6 +21,9 @@ FROM ${RUNNERIMAGE}
 
 # This is a dependency for `kubectl diff` tests
 COPY --from=debbase /usr/bin/diff /usr/local/bin/
+COPY --from=debbase /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu
+COPY --from=debbase /lib/x86_64-linux-gnu/libpthread.so.0 /lib/x86_64-linux-gnu
+COPY --from=debbase /lib64/ld-linux-x86-64.so.2 /lib64
 
 COPY cluster /kubernetes/cluster
 COPY ginkgo /usr/local/bin/

diff --git 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?=bullseye-v1.4.2
+BASE_IMAGE_VERSION?=bookworm-v1.0.0
 BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION}
 
 # Keep debian releases (e.g. debian 11 == bullseye) consistent