From 258cfa279e39bb4d6afdc1660967057c049ea701 Mon Sep 17 00:00:00 2001 From: Jean-Gabriel Gill-Couture Date: Tue, 9 Sep 2025 19:58:49 -0400 Subject: [PATCH] chore: Cleanup some logs and error message, also add a todo on bollard push failure to private registry --- harmony/src/domain/topology/k8s_anywhere.rs | 2 +- harmony/src/modules/application/rust.rs | 4 ++-- harmony/src/modules/prometheus/rhob_alerting_score.rs | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index bb7dc6a..e2243fa 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -552,7 +552,7 @@ impl MultiTargetTopology for K8sAnywhereTopology { match self.config.harmony_profile.to_lowercase().as_str() { "staging" => DeploymentTarget::Staging, "production" => DeploymentTarget::Production, - _ => todo!("HARMONY_PROFILE must be set when use_local_k3d is not set"), + _ => todo!("HARMONY_PROFILE must be set when use_local_k3d is false"), } } } diff --git a/harmony/src/modules/application/rust.rs b/harmony/src/modules/application/rust.rs index a49b3db..58dc046 100644 --- a/harmony/src/modules/application/rust.rs +++ b/harmony/src/modules/application/rust.rs @@ -268,8 +268,6 @@ impl RustWebapp { let docker = Docker::connect_with_socket_defaults().unwrap(); - // let push_options = PushImageOptionsBuilder::new().tag(tag); - let mut push_image_stream = docker.push_image( image_tag, Some(PushImageOptionsBuilder::new().build()), @@ -277,6 +275,8 @@ impl RustWebapp { ); while let Some(msg) = push_image_stream.next().await { + // let msg = msg?; + // TODO this fails silently, for some reason bollard cannot push to hub.nationtech.io debug!("Message: {msg:?}"); } diff --git a/harmony/src/modules/prometheus/rhob_alerting_score.rs b/harmony/src/modules/prometheus/rhob_alerting_score.rs index 788c58e..e2fbffe 100644 --- a/harmony/src/modules/prometheus/rhob_alerting_score.rs +++ b/harmony/src/modules/prometheus/rhob_alerting_score.rs @@ -221,7 +221,8 @@ impl RHOBAlertingInterpret { let output = Command::new("helm") .args([ - "install", + "upgrade", + "--install", "grafana-operator", "grafana-operator/grafana-operator", "--namespace", @@ -235,7 +236,7 @@ impl RHOBAlertingInterpret { if !output.status.success() { return Err(InterpretError::new(format!( - "helm install failed:\nstdout: {}\nstderr: {}", + "helm upgrade --install failed:\nstdout: {}\nstderr: {}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr) )));