From 30d3d5950de550b9f246ef15c6fbce9e4ea3f996 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 10 Feb 2021 12:06:10 +0100 Subject: [PATCH 1/2] jsonnet: do not include thanos field when not needed Signed-off-by: paulfantom --- jsonnet/kube-prometheus/components/prometheus.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index cf048c09..aef2a851 100644 --- 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, }, }, From e40e42cf7219d39450095be06da35fdd4647d5b9 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Wed, 10 Feb 2021 12:07:32 +0100 Subject: [PATCH 2/2] manifests: regenerate --- manifests/prometheus-prometheus.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 10f74df4..f1f8ef2f 100644 --- 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