Fix InhibitionClusterIsNotRunningPrometheusAgent on CAPI (#993)

* Fix InhibitionClusterIsNotRunningPrometheusAgent on CAPI * Remove inhibition from CAPI
giantswarm · Jan 4, 2024 · e386736 · e386736
1 parent d3e8036
commit e386736
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Ignore `api-spec` from `AppWithoutTeamAnnotation` alert.
 - Remove `WorkloadClusterManagedDeploymentNotSatisfiedPhoenix` as `cert-manager` is no longer owned by Phoenix.
-
+- Remove `InhibitionClusterIsNotRunningPrometheusAgent` inhibition on CAPI.
 
 ## [2.145.0] - 2023-11-30
 

diff --git a/helm/prometheus-rules/templates/alerting-rules/inhibit.prometheus-agent.rules.yml b/helm/prometheus-rules/templates/alerting-rules/inhibit.prometheus-agent.rules.yml
@@ -1,4 +1,4 @@
-{{- if ne .Values.managementCluster.provider.kind "kvm" }}
+{{- if and (ne .Values.managementCluster.provider.kind "kvm") ( eq .Values.managementCluster.provider.flavor "vintage") }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

diff --git a/...l/inhibit.prometheus-agent.rules.test.yml → ...s/inhibit.prometheus-agent.rules.test.yml b/...l/inhibit.prometheus-agent.rules.test.yml → ...s/inhibit.prometheus-agent.rules.test.yml