From 073b4cf66ad407ddea0882943a716e6c202261b7 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Tue, 16 May 2023 08:11:43 +0200
Subject: [PATCH] test/e2e/dra: fix kind cluster creation

The nightly containerd binary no longer works in the current kind base images:

   May 15 16:32:31 kind-worker containerd[222]: /usr/local/bin/containerd:
   /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by
   /usr/local/bin/containerd)

kind now builds containerd directly with the base images. The official base
images still use containerd 1.6, so we have to use a special base image that
was prepared for this purpose.

Because the containerd config can be patched through kind, we don't need to
modify the generated node image anymore.
---
 test/e2e/dra/kind-build-image.sh | 29 ++++-------------------------
 test/e2e/dra/kind.yaml           |  6 ++++++
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/test/e2e/dra/kind-build-image.sh b/test/e2e/dra/kind-build-image.sh
index c95f103df00..eaf9768ec62 100755
--- a/test/e2e/dra/kind-build-image.sh
+++ b/test/e2e/dra/kind-build-image.sh
@@ -23,30 +23,9 @@ set -ex
 set -o pipefail
 
 tag="$1"
-containerd="containerd-1.7.0-79-g2503bef58" # from https://github.com/kind-ci/containerd-nightlies/releases
 
-tmpdir="$(mktemp -d)"
-cleanup() {
-    rm -rf "$tmpdir"
-}
-trap cleanup EXIT
+# 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"
 
-goarch=$(go env GOARCH)
-
-kind build node-image --image "$tag" "$(pwd)"
-curl -L --silent https://github.com/kind-ci/containerd-nightlies/releases/download/$containerd/$containerd-linux-"$goarch".tar.gz | tar -C "$tmpdir" -vzxf -
-curl -L --silent https://github.com/kind-ci/containerd-nightlies/releases/download/$containerd/runc."$goarch" >"$tmpdir/runc"
-
-cat >"$tmpdir/Dockerfile" <<EOF
-FROM $tag
-
-COPY bin/* /usr/local/bin/
-RUN chmod a+rx /usr/local/bin/*
-COPY runc /usr/local/sbin
-RUN chmod a+rx /usr/local/sbin/runc
-
-# Enable CDI as described in https://github.com/container-orchestrated-devices/container-device-interface#containerd-configuration
-RUN sed -i -e '/\[plugins."io.containerd.grpc.v1.cri"\]/a \ \ enable_cdi = true' /etc/containerd/config.toml
-EOF
-
-docker build --tag "$tag" "$tmpdir"
+kind build node-image --base-image "$base_image"  --image "$tag" "$(pwd)"
diff --git a/test/e2e/dra/kind.yaml b/test/e2e/dra/kind.yaml
index 7da297baa37..59884ed31b5 100644
--- a/test/e2e/dra/kind.yaml
+++ b/test/e2e/dra/kind.yaml
@@ -1,5 +1,11 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+containerdConfigPatches:
+# Enable CDI as described in
+# https://github.com/container-orchestrated-devices/container-device-interface#containerd-configuration
+- |-
+  [plugins."io.containerd.grpc.v1.cri"]
+    enable_cdi = true
 nodes:
 - role: control-plane
   kubeadmConfigPatches: