add namespace to the component selectors

in order to select the right components in case multiple operators are running in the same cluster
2018-12-12 16:17:17 +00:00
parent 9c467d2333
commit 7e055479d6
1 changed files with 3 additions and 3 deletions
--- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet
@@ -32,9 +32,9 @@ local configMapList = k.core.v1.configMapList;
    coreDNSSelector: 'job="kube-dns"',
    podLabel: 'pod',

-    alertmanagerSelector: 'job="alertmanager-main"',
-    prometheusSelector: 'job="prometheus-k8s"',
-    prometheusOperatorSelector: 'job="prometheus-operator"',
+    alertmanagerSelector: 'job="alertmanager-main",namespace="' + $._config.namespace + '"',
+    prometheusSelector: 'job="prometheus-' + $._config.prometheus.name + '",namespace="' + $._config.namespace + '"',
+    prometheusOperatorSelector: 'job="prometheus-operator",namespace="' + $._config.namespace + '"',

    jobs: {
      Kubelet: $._config.kubeletSelector,