From 8c6611fb70b54b8f112adcb2eef921bbf637e57a Mon Sep 17 00:00:00 2001
From: Maxime Brunet <maxime.brunet@paytm.com>
Date: Mon, 19 Jul 2021 21:24:07 -0700
Subject: [PATCH] Filter out keys instead of hiding them

Signed-off-by: Maxime Brunet <maxime.brunet@paytm.com>
---
 CHANGELOG.md                                                | 2 +-
 all.jsonnet                                                 | 6 +++---
 jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet    | 2 +-
 jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet | 2 +-
 jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca0e559d..e54e636d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 
 ### Changed
 
-- [#234](https://github.com/thanos-io/kube-thanos/pull/234) (compact|store)-shards/receive-hashrings: Hide non-resource fields (`hashrings`/`shards`)
+-
 
 ### Added
 
diff --git a/all.jsonnet b/all.jsonnet
index 83853d47..34885bf3 100644
--- a/all.jsonnet
+++ b/all.jsonnet
@@ -253,6 +253,6 @@ local finalQ = t.query(q.config {
   for name in std.objectFields(strs.shards[shard])
   if strs.shards[shard][name] != null
 } +
-{ ['thanos-compact-shards-' + name]: cs[name] for name in std.objectFields(cs) if cs[name] != null } +
-{ ['thanos-receive-hashrings-' + name]: rcvs[name] for name in std.objectFields(rcvs) if rcvs[name] != null } +
-{ ['thanos-store-shards-' + name]: strs[name] for name in std.objectFields(strs) if strs[name] != null }
+{ ['thanos-compact-shards-' + name]: cs[name] for name in std.objectFields(cs) if name != 'shards' && cs[name] != null } +
+{ ['thanos-receive-hashrings-' + name]: rcvs[name] for name in std.objectFields(rcvs) if name != 'hashrings' && rcvs[name] != null } +
+{ ['thanos-store-shards-' + name]: strs[name] for name in std.objectFields(strs) if name != 'shards' && strs[name] != null }
diff --git a/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet
index 422341c4..694aacde 100644
--- a/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet
@@ -29,7 +29,7 @@ function(params)
       },
     },
 
-    shards:: {
+    shards: {
       ['shard' + i]: compact(config {
         name+: '-%d' % i,
         commonLabels+:: { 'compact.thanos.io/shard': 'shard-' + i },
diff --git a/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet
index 558876ab..97b592a6 100644
--- a/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet
@@ -30,7 +30,7 @@ function(params)
         labels: config.commonLabels,
       },
     },
-    hashrings:: {
+    hashrings: {
       [h.hashring]: receive(config {
         name+: '-' + h.hashring,
         commonLabels+:: {
diff --git a/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet b/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet
index 3aa21598..1172cc9c 100644
--- a/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet
@@ -28,7 +28,7 @@ function(params)
       },
     },
 
-    shards:: {
+    shards: {
       ['shard' + i]: store(config {
         name+: '-%d' % i,
         commonLabels+:: { 'store.thanos.io/shard': 'shard-' + i },