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

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

5
Cargo.lock generated
View File

@ -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",
]

View File

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

View File

@ -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",