NationTech/harmony
6
0
Fork 1
Code Issues 32 Pull Requests 6 Actions 7 Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into fix/argo
All checks were successful
Run Check Script / check (pull_request) Successful in 58s
Details

Browse Source
This commit is contained in:
Ian Letourneau 2025-09-08 10:01:06 -04:00
commit ab34b06aec
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -1842,8 +1842,13 @@ dependencies = [
name = "example-try-rust-webapp" name = "example-try-rust-webapp"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"base64 0.22.1",
"env_logger",
"harmony", "harmony",
"harmony_cli", "harmony_cli",
"harmony_macros",
"harmony_types",
"log",
"tokio", "tokio",
"url", "url",
] ]

1
examples/try_rust_webapp/src/main.rs
View File

@ -11,7 +11,6 @@ use harmony::{
}, },
topology::K8sAnywhereTopology, topology::K8sAnywhereTopology,
}; };
use harmony_types::net::Url; use harmony_types::net::Url;
#[tokio::main] #[tokio::main]

6
harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs
View File

@ -197,12 +197,6 @@ impl K8sPrometheusCRDAlertingInterpret {
} }
async fn ensure_grafana_operator(&self) -> Result<Outcome, InterpretError> { 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") let _ = Command::new("helm")
.args([ .args([
"repo", "repo",