From 1a814389fea6bddc611a4218850a03544feac11b Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Thu, 13 Jun 2024 11:18:17 +0200 Subject: [PATCH] fix: Allow running make cluster-down when binaries are missing Swap the order of commands in hack/e2e-setup.sh, so it becomes possible to run 'make cluster-down` when the kind/kubectl binaries are missing. Signed-off-by: Felix Matouschek --- Makefile | 2 +- hack/e2e-setup.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5ddb50d..a8348f7 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ cluster-up: .PHONY: cluster-down cluster-down: - hack/e2e-setup.sh --cleanup + hack/e2e-setup.sh --install-kind --install-kubectl --cleanup .PHONY: build-venv build-venv: diff --git a/hack/e2e-setup.sh b/hack/e2e-setup.sh index 051c615..5f6b345 100755 --- a/hack/e2e-setup.sh +++ b/hack/e2e-setup.sh @@ -389,11 +389,6 @@ if [ "${ARGCOUNT}" -eq "0" ]; then OPT_CREATE_NAD=true fi -if [ "${OPT_CLEANUP}" == true ]; then - cleanup - exit 0 -fi - if [ "${OPT_INSTALL_KIND}" == true ]; then install_kind fi @@ -402,6 +397,11 @@ if [ "${OPT_INSTALL_KUBECTL}" == true ]; then install_kubectl fi +if [ "${OPT_CLEANUP}" == true ]; then + cleanup + exit 0 +fi + if [ "${OPT_CONFIGURE_INOTIFY_LIMITS}" == true ]; then configure_inotify_limits fi