From b7a135a101231d8c7cbba0f5c46c0da4d0d2c69c Mon Sep 17 00:00:00 2001
From: Arunprasad Rajkumar <arajkuma@redhat.com>
Date: Fri, 17 Dec 2021 18:52:04 +0530
Subject: [PATCH] Fix thanos sidecar selector
Previous PR[1] which deprecated `thanosSelector` accidentally broke the
usage of it. This commit restores the old behaviour along with newly
introduced `thanos` config variable.
[1] https://github.com/prometheus-operator/kube-prometheus/pull/1543
Co-authored-by: Pawe? Krupa <pawel@krupa.net.pl>
Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
---
jsonnet/kube-prometheus/components/prometheus.libsonnet | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
index 365a3aff..06d3487c 100644
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -35,13 +35,13 @@ local defaults = {
prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"',
prometheusName: '{{$labels.namespace}}/{{$labels.pod}}',
// TODO: remove `thanosSelector` after 0.10.0 release.
- thanosSelector: '',
+ thanosSelector: 'job="thanos-sidecar"',
thanos: {
targetGroups: {
namespace: defaults.namespace,
},
sidecar: {
- selector: 'job="thanos-sidecar"',
+ selector: defaults.mixin._config.thanosSelector,
thanosPrometheusCommonDimensions: 'namespace, pod',
},
},
--
GitLab