diff --git a/harmony/src/domain/topology/k8s_anywhere.rs b/harmony/src/domain/topology/k8s_anywhere.rs index de8c209..f1aec74 100644 --- a/harmony/src/domain/topology/k8s_anywhere.rs +++ b/harmony/src/domain/topology/k8s_anywhere.rs @@ -250,6 +250,7 @@ impl K8sAnywhereTopology { self.tenant_manager .get_or_try_init(async || -> Result { + // TOOD: checker si K8s ou K3d/s tenant manager (ref. issue https://git.nationtech.io/NationTech/harmony/issues/94) let k8s_client = self.k8s_client().await?; Ok(K8sTenantManager::new(k8s_client)) }) diff --git a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs index ad899dd..2aace1f 100644 --- a/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs +++ b/harmony/src/modules/prometheus/k8s_prometheus_alerting_score.rs @@ -261,8 +261,8 @@ impl K8sPrometheusCRDAlertingInterpret { let prom_spec = PrometheusSpec { alerting: Some(PrometheusSpecAlerting { alertmanagers: Some(vec![AlertmanagerEndpoints { - name: Some(format!("alertmanager-operated")), - namespace: Some(format!("{}", self.sender.namespace.clone())), + name: Some("alertmanager-operated".into()), + namespace: Some(self.sender.namespace.clone()), port: Some("web".into()), scheme: Some("http".into()), }]), @@ -271,7 +271,7 @@ impl K8sPrometheusCRDAlertingInterpret { service_monitor_namespace_selector: Some(LabelSelector { match_labels: BTreeMap::from([( "kubernetes.io/metadata.name".to_string(), - format!("{}", self.sender.namespace.clone()), + self.sender.namespace.clone(), )]), match_expressions: vec![], }), @@ -295,7 +295,7 @@ impl K8sPrometheusCRDAlertingInterpret { rule_namespace_selector: Some(LabelSelector { match_labels: BTreeMap::from([( "kubernetes.io/metadata.name".to_string(), - format!("{}", self.sender.namespace.clone()), + self.sender.namespace.clone(), )]), match_expressions: vec![], }),