Merge pull request #1031 from ArthurSens/fix-managed-cluster-addon

Managed-cluster addon shouldn't fully override prometheus object

Merge pull request #1031 from ArthurSens/fix-managed-cluster-addon
4b13b15f · Paweł Krupa · GitHub · 148fe71c · 5f06f0da · 4b13b15f
Unverified Commit 4b13b15f authored 4 years ago by Paweł Krupa Committed by GitHub 4 years ago
--- a/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
+++ b/jsonnet/kube-prometheus/addons/managed-cluster.libsonnet
@@ -27,7 +27,7 @@
  // Same as above but for ServiceMonitor's
  local p = super.prometheus,
-  prometheus: {
+  prometheus+: {
    [q]: p[q]
    for q in std.objectFields(p)
    if !std.setMember(q, ['serviceMonitorKubeControllerManager', 'serviceMonitorKubeScheduler'])