github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Use distroless/base:latest for Conformance image

Browse Source 
Going with the guess that nonroot is the problem of creating
/tmp/results/e2e.log in container

Removing manual creation of /tmp/results as well
This commit is contained in:
Wilson E. Husin 2021-03-08 16:18:10 -08:00
parent 6d52c00084
commit be3719a357
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/conformance/Dockerfile
View File

@ -15,13 +15,9 @@
ARG BASEIMAGE ARG BASEIMAGE
FROM gcr.io/k8s-staging-build-image/debian-base:v2.1.3 as base FROM gcr.io/k8s-staging-build-image/debian-base:v2.1.3 as base
RUN mkdir /tmp/results \
&& chown 65532 /tmp/results # Distroless nonroot UID
FROM ${BASEIMAGE} FROM ${BASEIMAGE}
COPY --from=base /tmp/results /tmp
# This is a dependency for `kubectl diff` tests # This is a dependency for `kubectl diff` tests
COPY --from=base /usr/bin/diff /usr/local/bin/ COPY --from=base /usr/bin/diff /usr/local/bin/

2
cluster/images/conformance/Makefile
View File

@ -31,7 +31,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA
CLUSTER_DIR?=$(shell pwd)/../../../cluster/ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
BASEIMAGE=gcr.io/distroless/base:nonroot BASEIMAGE=gcr.io/distroless/base:latest
TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX) TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX)
all: build all: build