From 36ca61312d0d36aacd55740a9625d2748a3a4e67 Mon Sep 17 00:00:00 2001
From: Wen Zhou <wenzhou@redhat.com>
Date: Wed, 14 Jan 2026 12:57:34 +0100
Subject: [PATCH] test(e2e): cleanup kind cluster

- if e2e-tests cluster exist, it fails to run "make test-e2e"
- main cleanup should be done in AfterSuite() call
- in certain case(kill/terminate) cluster might remain locally
  this PR is to add trap to preperly clean i up

Signed-off-by: Wen Zhou <wenzhou@redhat.com>
---
 test/e2e/e2e_suite_test.go | 28 +++++++++++++++++-----------
 test/scripts/run_e2e.sh    | 12 ++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
index 25c65afe26..edc615dce2 100644
--- a/test/e2e/e2e_suite_test.go
+++ b/test/e2e/e2e_suite_test.go
@@ -27,6 +27,8 @@ import (
 )
 
 const (
+	// kindClusterName is the name of the Kind cluster created for e2e tests.
+	kindClusterName = "e2e-tests"
 	// defaultReadyTimeout is the default timeout for a resource to report a ready state.
 	defaultReadyTimeout = 3 * time.Minute
 	// defaultInterval is the default interval to check if a resource exists or ready conditions.
@@ -108,8 +110,18 @@ var _ = ginkgo.BeforeSuite(func() {
 })
 
 var _ = ginkgo.AfterSuite(func() {
-	if k8sContext != "" {
-		// Used an existing Kubernetes context
+	if k8sContext == "" {
+		// delete kind cluster we created
+		ginkgo.By("Deleting kind cluster " + kindClusterName)
+		command := exec.Command("kind", "delete", "cluster", "--name", kindClusterName)
+		session, err := gexec.Start(command, ginkgo.GinkgoWriter, ginkgo.GinkgoWriter)
+		if err != nil {
+			ginkgo.GinkgoLogr.Error(err, "Failed to delete kind cluster")
+		} else {
+			gomega.Eventually(session).WithTimeout(60 * time.Second).Should(gexec.Exit())
+		}
+	} else {
+		// Used an existing Kubernetes context, clean up created resources
 		// Stop port-forward
 		if portForwardSession != nil {
 			portForwardSession.Terminate()
@@ -129,18 +141,12 @@ var _ = ginkgo.AfterSuite(func() {
 			err := testConfig.KubeCli.CoreV1().Namespaces().Delete(testConfig.Context, nsName, metav1.DeleteOptions{})
 			gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
 		}
-		return
 	}
-
-	command := exec.Command("kind", "delete", "cluster", "--name", "e2e-tests")
-	session, err := gexec.Start(command, ginkgo.GinkgoWriter, ginkgo.GinkgoWriter)
-	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
-	gomega.Eventually(session).WithTimeout(600 * time.Second).Should(gexec.Exit(0))
 })
 
 // Create the Kubernetes cluster for the E2E tests and load the local images
 func setupK8sCluster() {
-	command := exec.Command("kind", "create", "cluster", "--name", "e2e-tests", "--config", "-")
+	command := exec.Command("kind", "create", "cluster", "--name", kindClusterName, "--config", "-")
 	stdin, err := command.StdinPipe()
 	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
 	go func() {
@@ -165,7 +171,7 @@ func kindLoadImage(image string) {
 	tempDir := ginkgo.GinkgoT().TempDir()
 	target := tempDir + "/container.tar"
 
-	ginkgo.By(fmt.Sprintf("Loading %s into the cluster e2e-tests using %s", image, containerRuntime))
+	ginkgo.By(fmt.Sprintf("Loading %s into the cluster %s using %s", image, kindClusterName, containerRuntime))
 
 	_, err := exec.LookPath(containerRuntime)
 	gomega.Expect(err).ShouldNot(gomega.HaveOccurred(), "Could not find %s in PATH", containerRuntime)
@@ -182,7 +188,7 @@ func kindLoadImage(image string) {
 	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
 	gomega.Eventually(session).WithTimeout(600 * time.Second).Should(gexec.Exit(0))
 
-	command = exec.Command("kind", "--name", "e2e-tests", "load", "image-archive", target)
+	command = exec.Command("kind", "--name", kindClusterName, "load", "image-archive", target)
 	session, err = gexec.Start(command, ginkgo.GinkgoWriter, ginkgo.GinkgoWriter)
 	gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
 	gomega.Eventually(session).WithTimeout(600 * time.Second).Should(gexec.Exit(0))
diff --git a/test/scripts/run_e2e.sh b/test/scripts/run_e2e.sh
index 5d81e4ce68..a51fe0f4ba 100755
--- a/test/scripts/run_e2e.sh
+++ b/test/scripts/run_e2e.sh
@@ -1,5 +1,17 @@
 #!/bin/bash
 
+set -euo pipefail
+
+cleanup() {
+    echo "Interrupted! Cleaning up kind cluster..."
+    kind delete cluster --name e2e-tests 2>/dev/null || true
+    exit 130  # SIGINT (Ctrl+C)
+}
+
+# Set trap only for interruption signals
+# Normally kind cluster cleanup is done by AfterSuite
+trap cleanup INT TERM
+
 echo "Running end to end tests"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"