From 24d9633998e79b5521c47def190315f65bd4bdf1 Mon Sep 17 00:00:00 2001
From: Adin Hodovic <hodovicadin@gmail.com>
Date: Mon, 15 Mar 2021 14:23:38 +0100
Subject: [PATCH] Fix managed Cluster addon
---
.../addons/managed-cluster.libsonnet | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet b/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
index f9032abd..14d008d9 100644
--- a/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
+++ b/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
@@ -11,10 +11,17 @@
for k in std.objectFields(j)
if !std.setMember(k, ['KubeControllerManager', 'KubeScheduler'])
},
+ },
+
+ local k = super.kubernetesControlPlane,
- // Skip alerting rules too
- prometheus+: {
- rules+:: {
+ kubernetesControlPlane+: {
+ [q]: null
+ for q in std.objectFields(k)
+ if std.setMember(q, ['serviceMonitorKubeControllerManager', 'serviceMonitorKubeScheduler'])
+ } + {
+ prometheusRule+: {
+ spec+: {
local g = super.groups,
groups: [
h
@@ -24,12 +31,4 @@
},
},
},
-
- // Same as above but for ServiceMonitor's
- local p = super.prometheus,
- prometheus+: {
- [q]: p[q]
- for q in std.objectFields(p)
- if !std.setMember(q, ['serviceMonitorKubeControllerManager', 'serviceMonitorKubeScheduler'])
- },
}
--
GitLab