Cargo.lock

@@ -1700,6 +1700,16 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "example_remove_rook_osd"
+version = "0.1.0"
+dependencies = [
+ "harmony",
+ "harmony_cli",
+ "harmony_tui",
+ "tokio",
+]
+
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -4255,15 +4265,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
-[[package]]
-name = "remove_rook_osd"
-version = "0.1.0"
-dependencies = [
- "harmony",
- "harmony_cli",
- "tokio",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.11.27"

examples/remove_rook_osd/Cargo.toml

@@ -1,11 +0,0 @@
-[package]
-name = "example-remove-rook-osd"
-edition = "2024"
-version.workspace = true
-readme.workspace = true
-license.workspace = true
-
-[dependencies]
-harmony = { version = "0.1.0", path = "../../harmony" }
-harmony_cli = { version = "0.1.0", path = "../../harmony_cli" }
-tokio.workspace = true

examples/remove_rook_osd/src/main.rs

@@ -1,18 +0,0 @@
-use harmony::{
-    inventory::Inventory, modules::storage::ceph::ceph_remove_osd_score::CephRemoveOsd,
-    topology::K8sAnywhereTopology,
-};
-
-#[tokio::main]
-async fn main() {
-    let ceph_score = CephRemoveOsd {
-        osd_deployment_name: "rook-ceph-osd-2".to_string(),
-        rook_ceph_namespace: "rook-ceph".to_string(),
-    };
-
-    let topology = K8sAnywhereTopology::from_env();
-    let inventory = Inventory::autoload();
-    harmony_cli::run(inventory, topology, vec![Box::new(ceph_score)], None)
-        .await
-        .unwrap();
-}

harmony/src/domain/topology/k8s.rs

@@ -65,7 +65,11 @@ impl K8sClient {
             debug!("getting default namespace deployment");
             Api::default_namespaced(self.client.clone())
         };
-        debug!("getting deployment {} in ns {}", name, namespace.unwrap());
+        debug!(
+            "getting deployment {} in ns {}",
+            name,
+            namespace.unwrap()
+        );
         Ok(deps.get_opt(name).await?)
     }
 

harmony/src/modules/storage/ceph/ceph_osd_replacement_score.rs

@@ -293,7 +293,8 @@ impl CephRemoveOsdInterpret {
                 vec![
                     "sh",
                     "-c",
-                    format!("ceph osd purge {osd_id_numeric} --yes-i-really-mean-it && ceph auth del {osd_id_full}").as_str(),
+                    format!("ceph osd purge {osd_id_numeric} --yes-i-really-mean-it").as_str(),
+                    format!("ceph auth del {osd_id_full}").as_str(),
                 ],
             )
             .await?;

harmony/src/modules/storage/ceph/mod.rs

@@ -1 +1 @@
-pub mod ceph_remove_osd_score;
+pub mod ceph_osd_replacement_score;