mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-08-26 08:51:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #929 from paulfantom/thanos-fix

Browse Source 
Do not include thanos config when thanos is not used.
This commit is contained in:
Kemal Akkoyun 2021-02-11 15:35:37 +01:00 committed by GitHub
commit 2a66bb88b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/components/prometheus.libsonnet
View File

@ -274,7 +274,7 @@ function(params) {
runAsNonRoot: true, runAsNonRoot: true,
fsGroup: 2000, fsGroup: 2000,
}, },
thanos: p.config.thanos, [if std.objectHas(params, 'thanos') then 'thanos']: p.config.thanos,
}, },
}, },

1
manifests/prometheus-prometheus.yaml
View File

@ -44,5 +44,4 @@ spec:
serviceAccountName: prometheus-k8s serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {} serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {} serviceMonitorSelector: {}
thanos: {}
version: 2.24.0 version: 2.24.0