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

Fix managed cluster addon
This commit is contained in:
Paweł Krupa 2021-03-15 14:43:29 +01:00 committed by GitHub
commit 7c43411531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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