From 1000ed64e0937fde8e19643b86e849ceeeaf8a9b Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 19 Jul 2023 10:14:37 +0200 Subject: [PATCH] Use debian-base instead of distroless for conformance image The `diff` binary (required by the `kubectl diff` e2e test) gets statically or dynamically linked based on the used glibc version. We cannot really predict that behavior for the various platforms of debian-base and therefore cannot copy the binary around. This means that distroless is not a great choice for the conformance image unless we stop relying on `diff`. This means we now switch back to `debian-base` for the conformance image to simplify the build process and reduce the amount of moving parts. Signed-off-by: Sascha Grunert --- test/conformance/image/Dockerfile | 10 ---------- test/conformance/image/Makefile | 8 +------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/test/conformance/image/Dockerfile b/test/conformance/image/Dockerfile index caaf132d234..98ed8594bc6 100644 --- a/test/conformance/image/Dockerfile +++ b/test/conformance/image/Dockerfile @@ -12,19 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG BASEIMAGE ARG RUNNERIMAGE - -FROM ${BASEIMAGE} as debbase - 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/ COPY e2e.test /usr/local/bin/ diff --git a/test/conformance/image/Makefile b/test/conformance/image/Makefile index 51949b8755d..2351782506d 100644 --- a/test/conformance/image/Makefile +++ b/test/conformance/image/Makefile @@ -34,12 +34,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.0 -BASEIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} - -# Keep debian releases (e.g. debian 11 == bullseye) consistent -# between BASE_IMAGE_VERSION and DISTROLESS_IMAGE images -DISTROLESS_IMAGE?=base-debian11 -RUNNERIMAGE?=gcr.io/distroless/${DISTROLESS_IMAGE}:latest +RUNNERIMAGE?=${KUBE_BASE_IMAGE_REGISTRY}/build-image/debian-base-${ARCH}:${BASE_IMAGE_VERSION} TEMP_DIR:=$(shell mktemp -d -t conformance-XXXXXX) @@ -68,7 +63,6 @@ endif --load \ --pull \ -t ${REGISTRY}/conformance-${ARCH}:${VERSION} \ - --build-arg BASEIMAGE=$(BASEIMAGE) \ --build-arg RUNNERIMAGE=$(RUNNERIMAGE) \ ${TEMP_DIR} rm -rf "${TEMP_DIR}"