Merge branch 'master' into feat/crd-alertmanager-configs

examples/rust/src/main.rs

@@ -2,7 +2,6 @@ use std::{path::PathBuf, sync::Arc};
 
 use harmony::{
     inventory::Inventory,
-    maestro::Maestro,
     modules::{
         application::{
             ApplicationScore, RustWebFramework, RustWebapp,
@@ -17,13 +16,6 @@ use harmony::{
 
 #[tokio::main]
 async fn main() {
-    env_logger::init();
-
-    let topology = K8sAnywhereTopology::from_env();
-    let mut maestro = Maestro::initialize(Inventory::autoload(), topology)
-        .await
-        .unwrap();
-
     let application = Arc::new(RustWebapp {
         name: "harmony-example-rust-webapp".to_string(),
         domain: Url::Url(url::Url::parse("https://rustapp.harmony.example.com").unwrap()),
@@ -55,6 +47,12 @@ async fn main() {
         application,
     };
 
-    maestro.register_all(vec![Box::new(app)]);
-    harmony_cli::init(maestro, None).await.unwrap();
+    harmony_cli::run(
+        Inventory::autoload(),
+        K8sAnywhereTopology::from_env(),
+        vec![Box::new(app)],
+        None,
+    )
+    .await
+    .unwrap();
 }