Merge pull request #295 from dschaaff/receive-router-selector-fix

thanos-io · May 3, 2024 · a28d8ac · a28d8ac
2 parents 4863995 + e78ee31
commit a28d8ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet
@@ -19,6 +19,12 @@ function(params) {
     'app.kubernetes.io/component': tr.config.name + '-router',
   },
 
+  podLabelSelector:: {
+    [labelName]: tr.routerLabels[labelName]
+    for labelName in std.objectFields(tr.routerLabels)
+    if labelName != 'app.kubernetes.io/version'
+  },
+
   service: {
     apiVersion: 'v1',
     kind: 'Service',
@@ -77,7 +83,7 @@ function(params) {
     },
     spec: {
       replicas: tr.config.routerReplicas,
-      selector: { matchLabels: tr.routerLabels },
+      selector: { matchLabels: tr.podLabelSelector },
       template: {
         metadata: {
           labels: tr.routerLabels,

diff --git a/manifests/thanos-receive-router-deployment.yaml b/manifests/thanos-receive-router-deployment.yaml
@@ -15,7 +15,6 @@ spec:
       app.kubernetes.io/component: thanos-receive-router
       app.kubernetes.io/instance: thanos-receive
       app.kubernetes.io/name: thanos-receive
-      app.kubernetes.io/version: v0.31.0
   template:
     metadata:
       labels: