Merge branch 'master' into fix/argo

fix/grafana-operator (#132 )
* deploy namespaced grafana operator in all cases Co-authored-by: Ian Letourneau <ian@noma.to> Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/132 Co-authored-by: Willem <wrolleman@nationtech.io> Co-committed-by: Willem <wrolleman@nationtech.io>
2025-09-08 10:01:06 -04:00 · 2025-09-08 13:59:12 +00:00 · 2025-09-08 13:52:25 +00:00
3 changed files with 5 additions and 7 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1842,8 +1842,13 @@ dependencies = [
 name = "example-try-rust-webapp"
 version = "0.1.0"
 dependencies = [
 "base64 0.22.1",
 "env_logger",
 "harmony",
 "harmony_cli",
 "harmony_macros",
 "harmony_types",
 "log",
 "tokio",
 "url",
 ]
--- a/examples/try_rust_webapp/src/main.rs
+++ b/examples/try_rust_webapp/src/main.rs
@ -11,7 +11,6 @@ use harmony::{
    },
    topology::K8sAnywhereTopology,
 };
 use harmony_types::net::Url;
 #[tokio::main]
--- a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs
+++ b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs
@ -197,12 +197,6 @@ impl K8sPrometheusCRDAlertingInterpret {
    }
    async fn ensure_grafana_operator(&self) -> Result<Outcome, InterpretError> {
        // if self.crd_exists("grafanas.grafana.integreatly.org").await {
        //     debug!("grafana CRDs already exist — skipping install.");
        //     return Ok(Outcome::success("Grafana CRDs already exist".to_string()));
        // }
        //may not need to check this since the grafana operator is namespaceScope=true -> it
        //will deploy with rolebindings rather than cluster role bindings
        let _ = Command::new("helm")
            .args([
                "repo",
Author	SHA1	Message	Date
Ian Letourneau	ab34b06aec	Merge branch 'master' into fix/argo All checks were successful Run Check Script / check (pull_request) Successful in 58s Details	2025-09-08 10:01:06 -04:00
Willem	0a324184ad	fix/grafana-operator (#132 ) Some checks are pending Run Check Script / check (push) Waiting to run Details Compile and package harmony_composer / package_harmony_composer (push) Waiting to run Details * deploy namespaced grafana operator in all cases Co-authored-by: Ian Letourneau <ian@noma.to> Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/132 Co-authored-by: Willem <wrolleman@nationtech.io> Co-committed-by: Willem <wrolleman@nationtech.io>	2025-09-08 13:59:12 +00:00
Willem	ad2ae2e4f8	feat(example): added an example of packaging a rust app from github (#124 ) Some checks failed Run Check Script / check (push) Successful in 1m9s Details Compile and package harmony_composer / package_harmony_composer (push) Has been cancelled Details * better caching when building docker images for app Reviewed-on: https://git.nationtech.io/NationTech/harmony/pulls/124 Reviewed-by: johnride <jg@nationtech.io> Co-authored-by: Willem <wrolleman@nationtech.io> Co-committed-by: Willem <wrolleman@nationtech.io>	2025-09-08 13:52:25 +00:00