diff --git a/CHANGELOG.md b/CHANGELOG.md index d516e1d9..a959b28e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add alert to monitor the `KubeadmConfig` CRs having trouble generating bootstrap data. +### Changed + +- Ignore HelmReleases in e2e test organization namespaces for cabbage `FluxHelmReleaseFailed` (cilium, network-policies, coredns) + ## [4.27.0] - 2024-11-27 ### Added diff --git a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml index fb29bf7c..f4956e12 100644 --- a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml +++ b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/cilium.rules.yml @@ -65,7 +65,7 @@ spec: description: |- {{`Flux HelmRelease {{ $labels.name }} in ns {{ $labels.exported_namespace }} on {{ $labels.installation }}-{{ $labels.cluster_id }} is stuck in Failed state.`}} opsrecipe: fluxcd-failing-helmrelease/ - expr: gotk_reconcile_condition{type="Ready", status="False", kind="HelmRelease", cluster_type="management_cluster", exported_namespace!="flux-giantswarm", name=~".*(cilium|network-policies)"} > 0 + expr: gotk_reconcile_condition{type="Ready", status="False", kind="HelmRelease", cluster_type="management_cluster", exported_namespace!="flux-giantswarm", exported_namespace!~"org-t-.*", name=~".*(cilium|network-policies)"} > 0 for: 20m labels: area: platform diff --git a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml index 09ceb4da..829345d8 100644 --- a/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml +++ b/helm/prometheus-rules/templates/platform/cabbage/alerting-rules/coredns.rules.yml @@ -31,7 +31,7 @@ spec: description: |- {{`Flux HelmRelease {{ $labels.name }} in ns {{ $labels.exported_namespace }} on {{ $labels.installation }}-{{ $labels.cluster_id }} is stuck in Failed state.`}} opsrecipe: fluxcd-failing-helmrelease/ - expr: gotk_reconcile_condition{type="Ready", status="False", kind="HelmRelease", cluster_type="management_cluster", exported_namespace!="flux-giantswarm", name=~".*coredns"} > 0 + expr: gotk_reconcile_condition{type="Ready", status="False", kind="HelmRelease", cluster_type="management_cluster", exported_namespace!="flux-giantswarm", exported_namespace!~"org-t-.*", name=~".*coredns"} > 0 for: 20m labels: area: platform