diff --git a/test/e2e/dra/README.md b/test/e2e/dra/README.md index f61682870c3..0b1739709ad 100644 --- a/test/e2e/dra/README.md +++ b/test/e2e/dra/README.md @@ -13,22 +13,25 @@ for the test driver and that the e2e test has full control over all gRPC calls, in case that it needs that for operations like error injection or checking calls. -## Cluster setup +## Cluster setup preparation -The container runtime must support CDI. The latest cri-o releases contain -support, containerd 1.6.x does not. To bring up a kind cluster with containerd -built from their main branch, use: +The container runtime must support CDI. CRI-O supports CDI starting from release 1.23, +Containerd supports CDI starting from release 1.7. To bring up a Kind cluster with Containerd, +two things are needed: +- [build binaries from Kubernetes source code tree](https://github.com/kubernetes/community/blob/master/contributors/devel/development.md#building-kubernetes) +- [Kind](https://github.com/kubernetes-sigs/kind) -- [Bash version requirement](https://github.com/kubernetes/community/blob/master/contributors/devel/development.md#bash-version-requirement) +> NB: Kind switched to use worker-node base image with Containerd 1.7 by default starting from +release 0.20, build kind from latest main branch sources or use Kind release binary 0.20 or later. -- Build node image +### Build kind node image +After building Kubernetes, in Kubernetes source code tree biuld new node image: ```bash -$ test/e2e/dra/kind-build-image.sh dra/node:latest +$ kind build node-image --image dra/node:latest $(pwd) ``` -- Bring up a kind cluster - +## Bring up a Kind cluster ```bash $ kind create cluster --config test/e2e/dra/kind.yaml --image dra/node:latest ``` diff --git a/test/e2e/dra/kind-build-image.sh b/test/e2e/dra/kind-build-image.sh deleted file mode 100755 index 8313452751a..00000000000 --- a/test/e2e/dra/kind-build-image.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2022 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This scripts invokes `kind build image` so that the resulting -# image has a containerd with CDI support. -# -# Usage: kind-build-image.sh - -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" - -kind build node-image --image "$tag" "$(pwd)"