From e0b7f31ce6e3eeebab3d52a182ef9c8e33a7ca3b Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Tue, 23 May 2023 11:46:30 -0700 Subject: [PATCH] use standard base image in dra dev kind is on containerd 1.7.x now --- test/e2e/dra/kind-build-image.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/e2e/dra/kind-build-image.sh b/test/e2e/dra/kind-build-image.sh index eaf9768ec62..8313452751a 100755 --- a/test/e2e/dra/kind-build-image.sh +++ b/test/e2e/dra/kind-build-image.sh @@ -22,10 +22,9 @@ set -ex set -o pipefail +# TODO (betheelder,pohly): this script is a bit of a no-op now, but people may +# still be referencing it (CI is not). Clean up later. + tag="$1" -# Created manually in the kind repo by bentheelder with -# make -C images/base push EXTRA_BUILD_OPT=--build-arg=CONTAINERD_VERSION=v1.7.1 TAG=$(date +v%Y%m%d)-$(git describe --always --dirty)-containerd_v1.7.1 -base_image="gcr.io/k8s-staging-kind/base:v20230515-01914134-containerd_v1.7.1@sha256:468fc430a6848884b786c5cd2f1c03e7a0977f04fb129a2cda2a19ec986ddacb" - -kind build node-image --base-image "$base_image" --image "$tag" "$(pwd)" +kind build node-image --image "$tag" "$(pwd)"