cleanup

Signed-off-by: zirain <[email protected]>
envoyproxy · Nov 15, 2024 · 7bfa43f · 7bfa43f
1 parent d17732a
commit 7bfa43f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/test/e2e/tests/httproute_with_backend.go b/test/e2e/tests/httproute_with_backend.go
@@ -66,9 +66,11 @@ var EnvoyGatewayBackendTest = suite.ConformanceTest{
 			if err != nil {
 				t.Fatalf("failed to create backend %s: %v", backendIPName, err)
 			}
-			if err != nil {
-				t.Fatalf("failed to create backend %s: %v", backendIPName, err)
-			}
+			t.Cleanup(func() {
+				if err := DeleteBackend(suite.Client, types.NamespacedName{Name: backendIPName, Namespace: ns}); err != nil {
+					t.Fatalf("failed to delete backend %s: %v", backendIPName, err)
+				}
+			})
 
 			routeNN := types.NamespacedName{Name: "httproute-to-backend-ip", Namespace: ns}
 			gwNN := types.NamespacedName{Name: "same-namespace", Namespace: ns}

diff --git a/test/e2e/tests/tlsroute_with_backend.go b/test/e2e/tests/tlsroute_with_backend.go
@@ -57,6 +57,11 @@ var TLSRouteBackendIPTest = suite.ConformanceTest{
 			if err != nil {
 				t.Fatalf("failed to create backend %s: %v", backendIPName, err)
 			}
+			t.Cleanup(func() {
+				if err := DeleteBackend(suite.Client, types.NamespacedName{Name: backendIPName, Namespace: ns}); err != nil {
+					t.Fatalf("failed to delete backend %s: %v", backendIPName, err)
+				}
+			})
 			testTLSRouteWithBackend(t, suite, "tlsroute-to-backend-ip", backendIPName)
 		})
 	},

diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go
@@ -721,3 +721,11 @@ func CreateBackend(c client.Client, nn types.NamespacedName, clusterIP string) e
 	}
 	return c.Create(context.TODO(), backend)
 }
+
+func DeleteBackend(c client.Client, nn types.NamespacedName) error {
+	backend := &egv1a1.Backend{}
+	if err := c.Get(context.Background(), nn, backend); err != nil {
+		return err
+	}
+	return c.Delete(context.Background(), backend)
+}