Merge branch 'master' into change_alertmanagernotificationsfailing_ro…

…uting

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  architect: giantswarm/architect@4.35.6
+  architect: giantswarm/architect@4.37.0
 
 workflows:
   package-and-push-chart-on-tag:

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.146.0] - 2024-01-04
+
 ### Changed
 
 - Increase the time window for `NodeConnTrackAlmostExhausted`.
@@ -17,7 +19,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
 
@@ -2351,7 +2353,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Add existing rules from https://github.com/giantswarm/prometheus-meta-operator/pull/637/commits/bc6a26759eb955de92b41ed5eb33fa37980660f2
 
-[Unreleased]: https://github.com/giantswarm/prometheus-rules/compare/v2.145.0...HEAD
+[Unreleased]: https://github.com/giantswarm/prometheus-rules/compare/v2.146.0...HEAD
+[2.146.0]: https://github.com/giantswarm/prometheus-rules/compare/v2.145.0...v2.146.0
 [2.145.0]: https://github.com/giantswarm/prometheus-rules/compare/v2.144.0...v2.145.0
 [2.144.0]: https://github.com/giantswarm/prometheus-rules/compare/v2.143.2...v2.144.0
 [2.143.2]: https://github.com/giantswarm/prometheus-rules/compare/v2.143.1...v2.143.2

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: