From 92a17adddde5dfdd22c645a827d44c70734de7ac Mon Sep 17 00:00:00 2001
From: Craig Condit <ccondit@apache.org>
Date: Thu, 10 Oct 2024 09:39:26 -0600
Subject: [PATCH] [YUNIKORN-2911] Add kind-e2e Makefile target (#925)

Adds a simple kind-e2e Makefile target. This target starts a kind
cluster on the latest version, executes the e2e tests, and tears down
the cluster.

Ideally this should be run by users prior to PR pushes.

Also, update to kind image for v1.31.1.

Closes: #925
---
 .github/workflows/pre-commit.yml |  2 +-
 Makefile                         | 11 ++++++++++-
 scripts/run-e2e-tests.sh         |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index deeea5e0d..d31fe25cd 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -49,7 +49,7 @@ jobs:
       matrix:
         k8s:
           [
-            v1.31.0,
+            v1.31.1,
             v1.30.4,
             v1.29.8,
             v1.28.13,
diff --git a/Makefile b/Makefile
index 11eb865e1..127ed9bff 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ export PATH := $(BASE_DIR)/$(TOOLS_DIR):$(GO_EXE_PATH):$(PATH)
 
 # Default values for dev cluster
 ifeq ($(K8S_VERSION),)
-K8S_VERSION := v1.29.4
+K8S_VERSION := v1.31.1
 endif
 ifeq ($(CLUSTER_NAME),)
 CLUSTER_NAME := yk8s
@@ -705,14 +705,23 @@ arch:
 	@echo EXEC_ARCH=$(EXEC_ARCH)
 
 # Start dev cluster
+.PHONY: start-cluster
 start-cluster: $(KIND_BIN)
 	@"$(KIND_BIN)" delete cluster --name="$(CLUSTER_NAME)" || :
 	@./scripts/run-e2e-tests.sh -a install -n "$(CLUSTER_NAME)" -v "kindest/node:$(K8S_VERSION)" $(PLUGIN_OPTS)
 
 # Stop dev cluster
+.PHONY: stop-cluster
 stop-cluster: $(KIND_BIN)
 	@"$(KIND_BIN)" delete cluster --name="$(CLUSTER_NAME)"
 
+# Start dev cluster, run e2e tests, stop dev cluster
+.PHONY: kind-e2e
+kind-e2e: $(KIND_BIN)
+	@"$(KIND_BIN)" delete cluster --name="$(CLUSTER_NAME)" || : ; \
+		./scripts/run-e2e-tests.sh -a test -n "$(CLUSTER_NAME)" -v "kindest/node:$(K8S_VERSION)" $(PLUGIN_OPTS) ; STATUS=$$? ; \
+		"$(KIND_BIN)" delete cluster --name="$(CLUSTER_NAME)" || : ; exit $$STATUS
+
 # Run the e2e tests, this assumes yunikorn is running under yunikorn namespace
 .PHONY: e2e_test
 e2e_test: tools
diff --git a/scripts/run-e2e-tests.sh b/scripts/run-e2e-tests.sh
index 53dfc8da8..ede07f976 100755
--- a/scripts/run-e2e-tests.sh
+++ b/scripts/run-e2e-tests.sh
@@ -198,10 +198,10 @@ Examples:
   ${NAME} -a test -n yk8s -v kindest/node:v1.28.13
   ${NAME} -a test -n yk8s -v kindest/node:v1.29.8
   ${NAME} -a test -n yk8s -v kindest/node:v1.30.4
-  ${NAME} -a test -n yk8s -v kindest/node:v1.31.0
+  ${NAME} -a test -n yk8s -v kindest/node:v1.31.1
 
   Use a local helm chart path:
-    ${NAME} -a test -n yk8s -v kindest/node:v1.31.0 -p ../yunikorn-release/helm-charts/yunikorn
+    ${NAME} -a test -n yk8s -v kindest/node:v1.31.1 -p ../yunikorn-release/helm-charts/yunikorn
 EOF
 }