Fix removing daemonsets

skateco · Aug 11, 2024 · 7f676a0 · 7f676a0
1 parent b5d7750
commit 7f676a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -158,12 +158,12 @@ sudo apt-get install -y gcc make libssl-dev pkg-config
         - [ ] Fix pod naming to avoid collisions
     - Deployments
         - [x] Apply
-        - [ ] Remove
+        - [x] Remove
         - [x] List
         - [x] Output matches kubectl
     - Daemonsets
         - [x] Apply
-        - [ ] Remove
+        - [x] Remove
         - [x] List
         - [x] Output matches kubectl
     - Ingress

diff --git a/src/executor.rs b/src/executor.rs
@@ -294,7 +294,7 @@ impl DefaultExecutor {
 
         let ids = exec_cmd("podman", &["pod", "ls", "--filter", &format!("label=skate.io/namespace={}", ns), "--filter", &format!("label=skate.io/deployment={}", name), "-q"])?;
 
-        let ids = ids.split("\n").collect::<Vec<&str>>();
+        let ids = ids.split("\n").map(|l| l.trim()).filter(|l| !l.is_empty()).collect::<Vec<&str>>();
 
         self.remove_pods(ids, grace_period)
     }
@@ -304,10 +304,9 @@ impl DefaultExecutor {
         let ns = daemonset.metadata.namespace.unwrap_or("default".to_string());
 
         let ids = exec_cmd("podman", &["pod", "ls", "--filter", &format!("label=skate.io/namespace={}", ns), "--filter", &format!("label=skate.io/daemonset={}", name), "-q"])?;
-        let ids = ids.split("\n").collect::<Vec<&str>>();
-        let result = self.remove_pods(ids, grace_period);
-        let _ = self.reload_ingress();
-        result
+        let ids = ids.split("\n").map(|l| l.trim()).filter(|l| !l.is_empty()).collect::<Vec<&str>>();
+
+        self.remove_pods(ids, grace_period)
     }
 
     fn remove_pods(&self, ids: Vec<&str>, grace_period: Option<usize>) -> Result<(), Box<dyn Error>> {