Merge pull request #445 from dgrisonnet/backport-podmonitor

Backport podmonitor to release-0.3
2020-03-10 15:43:12 +01:00
parent ed71719c8e 1ade732468
commit 059149d37c
2 changed files with 2 additions and 0 deletions
--- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
@@ -182,6 +182,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
          serviceMonitorSelector: {},
          podMonitorSelector: {},
          serviceMonitorNamespaceSelector: {},
+          podMonitorNamespaceSelector: {},
          nodeSelector: { 'kubernetes.io/os': 'linux' },
          ruleSelector: selector.withMatchLabels({
            role: 'alert-rules',
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -14,6 +14,7 @@ spec:
  baseImage: quay.io/prometheus/prometheus
  nodeSelector:
    kubernetes.io/os: linux
+  podMonitorNamespaceSelector: {}
  podMonitorSelector: {}
  replicas: 2
  resources: