fix: regression on deleting objects in the simulated environment

acrlabs · Oct 9, 2024 · ab9a909 · ab9a909
1 parent 333e6fc
commit ab9a909
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/sk-driver/src/runner.rs b/sk-driver/src/runner.rs
@@ -151,8 +151,11 @@ pub async fn run_trace(ctx: DriverContext, client: kube::Client) -> EmptyResult
 
         for obj in &evt.deleted_objs {
             info!("deleting object {}", obj.namespaced_name());
+            let virtual_ns = format!("{}-{}", ctx.virtual_ns_prefix, obj.namespace().unwrap());
+            let mut vobj = obj.clone();
+            vobj.metadata.namespace = Some(virtual_ns);
             apiset
-                .api_for_obj(obj)
+                .api_for_obj(&vobj)
                 .await?
                 .delete(&obj.name_any(), &Default::default())
                 .await?;

diff --git a/sk-driver/src/tests/data/trace.json b/sk-driver/src/tests/data/trace.json
@@ -93,7 +93,17 @@
                     }
                 }
             ],
-            "deleted_objs": []
+            "deleted_objs": [
+                {
+                    "apiVersion": "apps/v1",
+                    "kind": "Deployment",
+                    "metadata": {
+                        "name": "nginx-deployment-2",
+                        "namespace": "default"
+                    },
+                    "spec": {}
+                }
+            ]
         }
     ],
     {

diff --git a/sk-driver/src/tests/runner_test.rs b/sk-driver/src/tests/runner_test.rs
@@ -152,6 +152,12 @@ async fn itest_run(#[case] has_start_marker: bool) {
             ));
             then.json_body(status_ok());
         })
+        .handle(|when, then| {
+            when.method(DELETE).path(format!(
+                "/apis/apps/v1/namespaces/{TEST_VIRT_NS_PREFIX}-{TEST_NS_NAME}/deployments/nginx-deployment-2"
+            ));
+            then.json_body(status_ok());
+        })
         .handle(|when, then| {
             when.path(format!("/apis/simkube.io/v1/simulationroots/{TEST_DRIVER_ROOT_NAME}"))
                 .method(DELETE);