From 0fff4ef5668437d360ec3f9380db69082b532283 Mon Sep 17 00:00:00 2001 From: Ian Letourneau Date: Sun, 27 Jul 2025 11:00:59 -0400 Subject: [PATCH] refactor(topo/k8s_anywhere): simplify local installation of k3d A Maestro was initialized with a new inventory simply to provide a localhost topology to install K3D locally. But in practice, the K3D installation wasn't actually using the topology nor the inventory. Directly installing K3D within the K8s Anywhere topology makes things simpler and actually enforce the topology to provide the capabilities required to install K3D. --- harmony/src/domain/topology/k8s_anywhere.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index 81e4546..adbfbec 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -10,9 +10,8 @@ use crate::{ executors::ExecutorError, interpret::{InterpretError, Outcome}, inventory::Inventory, - maestro::Maestro, modules::k3d::K3DInstallationScore, - topology::LocalhostTopology, + score::Score, }; use super::{ @@ -114,9 +113,10 @@ impl K8sAnywhereTopology { } async fn try_install_k3d(&self) -> Result<(), InterpretError> { - let maestro = Maestro::initialize(Inventory::autoload(), LocalhostTopology::new()).await?; - let k3d_score = self.get_k3d_installation_score(); - maestro.interpret(Box::new(k3d_score)).await?; + self.get_k3d_installation_score() + .create_interpret() + .execute(&Inventory::empty(), self) + .await?; Ok(()) }