From d4b69114be38ad4df803d6c362aaf9d685dc2875 Mon Sep 17 00:00:00 2001 From: Daniel Simionato Date: Mon, 6 May 2024 09:49:29 +0200 Subject: [PATCH] Add `cluster_control_plane_unhealthy` inhibition. (#1607) * Add `cluster_control_plane_unhealthy` inhibition. * updated test cases --- CHANGELOG.md | 6 +++++- files/templates/alertmanager/alertmanager.yaml | 6 ++++++ .../alertmanager-config/classic/capi/case-1-capa-mc.golden | 6 ++++++ .../alertmanager-config/classic/capi/case-2-capa.golden | 6 ++++++ .../alertmanager-config/classic/capi/case-3-capz.golden | 6 ++++++ .../test/alertmanager-config/classic/capi/case-4-eks.golden | 6 ++++++ .../test/alertmanager-config/classic/capi/case-5-gcp.golden | 6 ++++++ .../classic/vintage/case-1-vintage-mc.golden | 6 ++++++ .../classic/vintage/case-2-aws-v16.golden | 6 ++++++ .../classic/vintage/case-3-aws-v18.golden | 6 ++++++ .../mimir-enabled/capi/case-1-capa-mc.golden | 6 ++++++ .../mimir-enabled/capi/case-2-capa.golden | 6 ++++++ .../mimir-enabled/capi/case-3-capz.golden | 6 ++++++ .../mimir-enabled/capi/case-4-eks.golden | 6 ++++++ .../mimir-enabled/capi/case-5-gcp.golden | 6 ++++++ .../mimir-enabled/vintage/case-1-vintage-mc.golden | 6 ++++++ .../mimir-enabled/vintage/case-2-aws-v16.golden | 6 ++++++ .../mimir-enabled/vintage/case-3-aws-v18.golden | 6 ++++++ .../slack-token/capi/case-1-capa-mc.golden | 6 ++++++ .../alertmanager-config/slack-token/capi/case-2-capa.golden | 6 ++++++ .../alertmanager-config/slack-token/capi/case-3-capz.golden | 6 ++++++ .../alertmanager-config/slack-token/capi/case-4-eks.golden | 6 ++++++ .../alertmanager-config/slack-token/capi/case-5-gcp.golden | 6 ++++++ .../slack-token/vintage/case-1-vintage-mc.golden | 6 ++++++ .../slack-token/vintage/case-2-aws-v16.golden | 6 ++++++ .../slack-token/vintage/case-3-aws-v18.golden | 6 ++++++ 26 files changed, 155 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09d5a8db4..cf5ba77e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Add `cluster_control_plane_unhealthy` inhibition. + ## [4.74.0] - 2024-05-02 ### Changed - Expose prometheus agent sharding strategies as prometheus-meta-operator configuration parameters so we can experiment with the scaling strategies. -- + ## [4.73.1] - 2024-05-01 ### Fixed diff --git a/files/templates/alertmanager/alertmanager.yaml b/files/templates/alertmanager/alertmanager.yaml index 2b094cddb..1b8af98a7 100644 --- a/files/templates/alertmanager/alertmanager.yaml +++ b/files/templates/alertmanager/alertmanager.yaml @@ -611,6 +611,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-1-capa-mc.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-2-capa.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-3-capz.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-4-eks.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/capi/case-5-gcp.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-1-vintage-mc.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-2-aws-v16.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden index 225f602d1..620cba74b 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/classic/vintage/case-3-aws-v18.golden @@ -420,6 +420,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-1-capa-mc.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-2-capa.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-3-capz.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-4-eks.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/capi/case-5-gcp.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-1-vintage-mc.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-2-aws-v16.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden index c07849646..d52c75e54 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/mimir-enabled/vintage/case-3-aws-v18.golden @@ -439,6 +439,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-1-capa-mc.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-2-capa.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-3-capz.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-4-eks.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/capi/case-5-gcp.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-1-vintage-mc.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-2-aws-v16.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: diff --git a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden index 0f6df3074..1fe8fe818 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden +++ b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/slack-token/vintage/case-3-aws-v18.golden @@ -460,6 +460,12 @@ inhibit_rules: - cancel_if_cluster_with_notready_nodepools=true equal: [cluster_id] +- source_matchers: + - cluster_control_plane_unhealthy=true + target_matchers: + - cancel_if_cluster_control_plane_unhealthy=true + equal: [cluster_id] + - source_matchers: - instance_state_not_running=true target_matchers: