Merge pull request #929 from paulfantom/thanos-fix

Do not include thanos config when thanos is not used.
2021-02-11 15:35:37 +01:00
parent d283e67059 e40e42cf72
commit 2a66bb88b5
2 changed files with 1 additions and 2 deletions
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -274,7 +274,7 @@ function(params) {
        runAsNonRoot: true,
        fsGroup: 2000,
      },
-      thanos: p.config.thanos,
+      [if std.objectHas(params, 'thanos') then 'thanos']: p.config.thanos,
    },
  },

--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -44,5 +44,4 @@ spec:
  serviceAccountName: prometheus-k8s
  serviceMonitorNamespaceSelector: {}
  serviceMonitorSelector: {}
-  thanos: {}
  version: 2.24.0