From 8397d35ccab775ee4c4547b81a6391ed069a6a3e Mon Sep 17 00:00:00 2001 From: Lennart Jern Date: Mon, 3 Mar 2025 13:05:20 +0000 Subject: [PATCH] E2E: Don't install kind We are using the kind module directly in the test suite, so there is no need to install kind directly. Signed-off-by: Lennart Jern --- hack/ci-e2e.sh | 1 - hack/clean-e2e.sh | 1 - hack/e2e/ensure_kind.sh | 35 ----------------------------------- 3 files changed, 37 deletions(-) delete mode 100755 hack/e2e/ensure_kind.sh diff --git a/hack/ci-e2e.sh b/hack/ci-e2e.sh index 89c1624f9d..f11dc770d3 100755 --- a/hack/ci-e2e.sh +++ b/hack/ci-e2e.sh @@ -48,7 +48,6 @@ esac # Ensure requirements are installed "${REPO_ROOT}/hack/e2e/ensure_go.sh" export PATH="/usr/local/go/bin:${PATH}" -"${REPO_ROOT}/hack/e2e/ensure_kind.sh" "${REPO_ROOT}/hack/e2e/ensure_htpasswd.sh" # CAPI test framework uses kubectl in the background "${REPO_ROOT}/hack/e2e/ensure_kubectl.sh" diff --git a/hack/clean-e2e.sh b/hack/clean-e2e.sh index 40ab5d10fb..af6700cb26 100755 --- a/hack/clean-e2e.sh +++ b/hack/clean-e2e.sh @@ -3,7 +3,6 @@ REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. cd "${REPO_ROOT}" || exit 1 -kind delete cluster docker rm -f vbmc docker rm -f image-server-e2e docker rm -f sushy-tools diff --git a/hack/e2e/ensure_kind.sh b/hack/e2e/ensure_kind.sh deleted file mode 100755 index fc9a9bf8a2..0000000000 --- a/hack/e2e/ensure_kind.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -set -eux - -USR_LOCAL_BIN="/usr/local/bin" -MINIMUM_KIND_VERSION=v0.26.0 - -# Ensure the kind tool exists and is a viable version, or installs it -verify_kind_version() -{ - # If kind is not available on the path, get it - if ! [ -x "$(command -v kind)" ]; then - if [[ "${OSTYPE}" == "linux-gnu" ]]; then - echo "kind not found, installing" - curl -LO "https://kind.sigs.k8s.io/dl/${MINIMUM_KIND_VERSION}/kind-linux-amd64" - sudo install kind-linux-amd64 "${USR_LOCAL_BIN}/kind" - else - echo "Missing required binary in path: kind" - return 2 - fi - fi - - local kind_version - IFS=" " read -ra kind_version <<< "$(kind version)" - if [[ "${MINIMUM_KIND_VERSION}" != $(echo -e "${MINIMUM_KIND_VERSION}\n${kind_version[1]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) ]]; then - cat << EOF -Detected kind version: ${kind_version[2]}. -Requires ${MINIMUM_KIND_VERSION} or greater. -Please install ${MINIMUM_KIND_VERSION} or later. -EOF - return 2 - fi -} - -verify_kind_version