Merge pull request #1032 from adinhodovic/fix-managed-cluster-addon

Fix managed cluster addon

jsonnet/kube-prometheus/addons/managed-cluster.libsonnet

@@ -11,10 +11,17 @@
       for k in std.objectFields(j)
       if !std.setMember(k, ['KubeControllerManager', 'KubeScheduler'])
     },
+  },
 
-    // Skip alerting rules too
+  local k = super.kubernetesControlPlane,
-    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'])
-  },
 }