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

quick cleanup
All checks were successful
Run Check Script / check (pull_request) Successful in -44s
Details

Browse Source
This commit is contained in:
Ian Letourneau 2025-08-04 15:28:01 -04:00
parent a8394cda47
commit e078f5c062
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
harmony/src/domain/topology/k8s_anywhere.rs
View File

@ -250,6 +250,7 @@ impl K8sAnywhereTopology {
self.tenant_manager self.tenant_manager
.get_or_try_init(async || -> Result<K8sTenantManager, String> { .get_or_try_init(async || -> Result<K8sTenantManager, String> {
// 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?; let k8s_client = self.k8s_client().await?;
Ok(K8sTenantManager::new(k8s_client)) Ok(K8sTenantManager::new(k8s_client))
}) })

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

@ -261,8 +261,8 @@ impl K8sPrometheusCRDAlertingInterpret {
let prom_spec = PrometheusSpec { let prom_spec = PrometheusSpec {
alerting: Some(PrometheusSpecAlerting { alerting: Some(PrometheusSpecAlerting {
alertmanagers: Some(vec![AlertmanagerEndpoints { alertmanagers: Some(vec![AlertmanagerEndpoints {
name: Some(format!("alertmanager-operated")), name: Some("alertmanager-operated".into()),
namespace: Some(format!("{}", self.sender.namespace.clone())), namespace: Some(self.sender.namespace.clone()),
port: Some("web".into()), port: Some("web".into()),
scheme: Some("http".into()), scheme: Some("http".into()),
}]), }]),
@ -271,7 +271,7 @@ impl K8sPrometheusCRDAlertingInterpret {
service_monitor_namespace_selector: Some(LabelSelector { service_monitor_namespace_selector: Some(LabelSelector {
match_labels: BTreeMap::from([( match_labels: BTreeMap::from([(
"kubernetes.io/metadata.name".to_string(), "kubernetes.io/metadata.name".to_string(),
format!("{}", self.sender.namespace.clone()), self.sender.namespace.clone(),
)]), )]),
match_expressions: vec![], match_expressions: vec![],
}), }),
@ -295,7 +295,7 @@ impl K8sPrometheusCRDAlertingInterpret {
rule_namespace_selector: Some(LabelSelector { rule_namespace_selector: Some(LabelSelector {
match_labels: BTreeMap::from([( match_labels: BTreeMap::from([(
"kubernetes.io/metadata.name".to_string(), "kubernetes.io/metadata.name".to_string(),
format!("{}", self.sender.namespace.clone()), self.sender.namespace.clone(),
)]), )]),
match_expressions: vec![], match_expressions: vec![],
}), }),