From 1a814389fea6bddc611a4218850a03544feac11b Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Thu, 13 Jun 2024 11:18:17 +0200 Subject: [PATCH 1/2] 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 From 634ccb83633b842cccb78315793f0eff9d249be3 Mon Sep 17 00:00:00 2001 From: Felix Matouschek Date: Thu, 13 Jun 2024 11:19:20 +0200 Subject: [PATCH 2/2] chore: Bump versions in hack/e2e-setup.sh Bump the versions of installed software components during the e2e test setup to the latest stable releases. Signed-off-by: Felix Matouschek --- hack/e2e-setup.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hack/e2e-setup.sh b/hack/e2e-setup.sh index 5f6b345..6bfc3d2 100755 --- a/hack/e2e-setup.sh +++ b/hack/e2e-setup.sh @@ -23,17 +23,17 @@ set_default_params() { BIN_DIR=${BIN_DIR:-$DIR/../bin} KIND=${KIND:-$BIN_DIR/kind} - KIND_VERSION=${KIND_VERSION:-v0.22.0} + KIND_VERSION=${KIND_VERSION:-v0.23.0} KUBECTL=${KUBECTL:-$BIN_DIR/kubectl} - KUBECTL_VERSION=${KUBECTL_VERSION:-v1.29.2} + KUBECTL_VERSION=${KUBECTL_VERSION:-v1.30.2} - KUBEVIRT_VERSION=${KUBEVIRT_VERSION:-v1.1.0} - KUBEVIRT_CDI_VERSION=${KUBEVIRT_CDI_VERSION:-v1.58.1} - KUBEVIRT_COMMON_INSTANCETYPES_VERSION=${KUBEVIRT_COMMON_INSTANCETYPES_VERSION:-v0.4.0} + KUBEVIRT_VERSION=${KUBEVIRT_VERSION:-v1.2.2} + KUBEVIRT_CDI_VERSION=${KUBEVIRT_CDI_VERSION:-v1.59.0} + KUBEVIRT_COMMON_INSTANCETYPES_VERSION=${KUBEVIRT_COMMON_INSTANCETYPES_VERSION:-v1.0.0} KUBEVIRT_USE_EMULATION=${KUBEVIRT_USE_EMULATION:-"false"} - CNAO_VERSION=${CNAO_VERSION:-v0.91.0} + CNAO_VERSION=${CNAO_VERSION:-v0.93.0} REGISTRY_NAME=${REGISTRY_NAME:-kind-registry} REGISTRY_PORT=${REGISTRY_PORT:-5001}