From 9c5165beede3527fd0148aec563e8fe2b5b9ffd7 Mon Sep 17 00:00:00 2001
From: Jay Jijie Chen <1180092+jijiechen@users.noreply.github.com>
Date: Wed, 25 Sep 2024 21:47:59 +0800
Subject: [PATCH] test(gatewayapi): cleanup resources manually after dumping
 debug info (#11542)

cleanup resources manually after dumping debug info

Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
---
 test/e2e_env/gatewayapi/conformance_test.go | 31 +++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/test/e2e_env/gatewayapi/conformance_test.go b/test/e2e_env/gatewayapi/conformance_test.go
index 9db3699c4e9e..6aeadc81d6b3 100644
--- a/test/e2e_env/gatewayapi/conformance_test.go
+++ b/test/e2e_env/gatewayapi/conformance_test.go
@@ -51,29 +51,32 @@ func TestConformance(t *testing.T) {
 	opts := cluster.GetKubectlOptions()
 
 	t.Cleanup(func() {
-		if t.Failed() {
-			var namespaces []string
-			clientset, err := k8s.GetKubernetesClientFromOptionsE(t, opts)
-			if err == nil {
-				if nsList, err := clientset.CoreV1().Namespaces().List(context.Background(),
-					metav1.ListOptions{
-						LabelSelector: fmt.Sprintf("%s=%s", metadata.KumaSidecarInjectionAnnotation, metadata.AnnotationEnabled),
-					}); err == nil {
-					for _, ns := range nsList.Items {
-						namespaces = append(namespaces, ns.Name)
-					}
+		var meshNamespaces []string
+		clientset, err := k8s.GetKubernetesClientFromOptionsE(t, opts)
+		if err == nil {
+			if nsList, err := clientset.CoreV1().Namespaces().List(context.Background(),
+				metav1.ListOptions{
+					LabelSelector: fmt.Sprintf("%s=%s", metadata.KumaSidecarInjectionAnnotation, metadata.AnnotationEnabled),
+				}); err == nil {
+				for _, ns := range nsList.Items {
+					meshNamespaces = append(meshNamespaces, ns.Name)
 				}
 			}
+		}
 
-			if len(namespaces) > 0 {
+		if t.Failed() {
+			if len(meshNamespaces) > 0 {
 				g.Expect(func() error { //nolint:unparam  // we need this return type to be included in the Expect block
 					RegisterFailHandler(g.Fail)
-					DebugKube(cluster, "default", namespaces...)
+					DebugKube(cluster, "default", meshNamespaces...)
 					return nil
 				}()).To(Succeed())
 			}
 		}
 
+		for _, ns := range meshNamespaces {
+			g.Expect(cluster.DeleteNamespace(ns)).To(Succeed())
+		}
 		g.Expect(cluster.DeleteKuma()).To(Succeed())
 		g.Expect(cluster.DismissCluster()).To(Succeed())
 	})
@@ -106,7 +109,7 @@ func TestConformance(t *testing.T) {
 		RestConfig:           clientConfig,
 		Clientset:            clientset,
 		GatewayClassName:     "kuma",
-		CleanupBaseResources: true,
+		CleanupBaseResources: false,        // we want to collect details when test fails, so don't clean up here, we'll clean up resources by ourselves.
 		Debug:                Config.Debug, // controls if request details should be printed to stdout
 		NamespaceLabels: map[string]string{
 			metadata.KumaSidecarInjectionAnnotation: metadata.AnnotationEnabled,