Merge pull request #159 from metalmatze/empty-podmonitor-selector

Add empty podMonitorSelector to Prometheus resource
This commit is contained in:
Frederic Branczyk
2019-07-18 11:44:36 -07:00
committed by GitHub
3 changed files with 3 additions and 1 deletions

View File

@@ -170,6 +170,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
baseImage: $._config.imageRepos.prometheus, baseImage: $._config.imageRepos.prometheus,
serviceAccountName: 'prometheus-' + $._config.prometheus.name, serviceAccountName: 'prometheus-' + $._config.prometheus.name,
serviceMonitorSelector: {}, serviceMonitorSelector: {},
podMonitorSelector: {},
serviceMonitorNamespaceSelector: {}, serviceMonitorNamespaceSelector: {},
nodeSelector: { 'beta.kubernetes.io/os': 'linux' }, nodeSelector: { 'beta.kubernetes.io/os': 'linux' },
ruleSelector: selector.withMatchLabels({ ruleSelector: selector.withMatchLabels({

View File

@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
"version": "c8c850ef2b1b6f985075ee06fb86b347f9119b16" "version": "a535968c33952ac34db8b37afe6f447b50dc294a"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",

View File

@@ -14,6 +14,7 @@ spec:
baseImage: quay.io/prometheus/prometheus baseImage: quay.io/prometheus/prometheus
nodeSelector: nodeSelector:
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
podMonitorSelector: {}
replicas: 2 replicas: 2
resources: resources:
requests: requests: