From 0486c40ed044a0c3a439ddbfa421c3d5a3ddf158 Mon Sep 17 00:00:00 2001
From: Aviram Hassan <aviram@metalbear.co>
Date: Tue, 13 Feb 2024 14:04:47 +0200
Subject: [PATCH] Change cleanup to delete without grace (#2230)

---
 .../+delete-forcefully-on-tests.internal.md   |  1 +
 tests/src/utils.rs                            | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/+delete-forcefully-on-tests.internal.md

diff --git a/changelog.d/+delete-forcefully-on-tests.internal.md b/changelog.d/+delete-forcefully-on-tests.internal.md
new file mode 100644
index 00000000000..50cfb2e794e
--- /dev/null
+++ b/changelog.d/+delete-forcefully-on-tests.internal.md
@@ -0,0 +1 @@
+Change cleanup to delete without grace
\ No newline at end of file
diff --git a/tests/src/utils.rs b/tests/src/utils.rs
index 35cbc1c4f59..a02f241b0f5 100644
--- a/tests/src/utils.rs
+++ b/tests/src/utils.rs
@@ -562,7 +562,11 @@ impl ResourceGuard {
 
         let deleter = async move {
             println!("Deleting resource `{name}`");
-            let res = api.delete(&name, &DeleteParams::default()).await;
+            let delete_params = DeleteParams {
+                grace_period_seconds: Some(0),
+                ..Default::default()
+            };
+            let res = api.delete(&name, &delete_params).await;
             if let Err(e) = res {
                 println!("Failed to delete resource `{name}`: {e:?}");
             }
@@ -672,12 +676,14 @@ pub async fn service(
     } else {
         // If using a non-random name, delete existing resources first.
         // Just continue if they don't exist.
-        let _ = service_api
-            .delete(service_name, &DeleteParams::default())
-            .await;
-        let _ = deployment_api
-            .delete(service_name, &DeleteParams::default())
-            .await;
+        // Force delete
+        let delete_params = DeleteParams {
+            grace_period_seconds: Some(0),
+            ..Default::default()
+        };
+
+        let _ = service_api.delete(service_name, &delete_params).await;
+        let _ = deployment_api.delete(service_name, &delete_params).await;
 
         service_name.to_string()
     };