From 1ff5273f8720a5a528ad81859740d9604115f701 Mon Sep 17 00:00:00 2001
From: Arunprasad Rajkumar <arajkuma@redhat.com>
Date: Mon, 13 Dec 2021 16:23:27 +0530
Subject: [PATCH] Deprecate `thanosSelector` and keep until 0.10.0
Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
---
jsonnet/kube-prometheus/components/prometheus.libsonnet | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet
index 0151ed99..365a3aff 100644
--- a/jsonnet/kube-prometheus/components/prometheus.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet
@@ -34,6 +34,8 @@ local defaults = {
_config: {
prometheusSelector: 'job="prometheus-' + defaults.name + '",namespace="' + defaults.namespace + '"',
prometheusName: '{{$labels.namespace}}/{{$labels.pod}}',
+ // TODO: remove `thanosSelector` after 0.10.0 release.
+ thanosSelector: '',
thanos: {
targetGroups: {
namespace: defaults.namespace,
@@ -74,7 +76,8 @@ function(params) {
(import 'github.com/kubernetes-monitoring/kubernetes-mixin/lib/add-runbook-links.libsonnet') + {
_config+:: p._config.mixin._config,
targetGroups+: p._config.mixin._config.thanos.targetGroups,
- sidecar+: p._config.mixin._config.thanos.sidecar,
+ // TODO: remove `_config.thanosSelector` after 0.10.0 release.
+ sidecar+: { selector: p._config.mixin._config.thanosSelector } + p._config.mixin._config.thanos.sidecar,
},
prometheusRule: {
--
GitLab