Filter out keys instead of hiding them

Signed-off-by: Maxime Brunet <maxime.brunet@paytm.com>

CHANGELOG.md

@@ -17,7 +17,6 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 
 ### Changed
 - [#226](https://github.com/thanos-io/kube-thanos/pull/226) Only schedule thanos components on linux nodes.
-- [#234](https://github.com/thanos-io/kube-thanos/pull/234) receive-hashrings/store-shards: Hide non-resource fields (`hashrings`/`shards`)
 
 ### Added
 - [#228](https://github.com/thanos-io/kube-thanos/pull/228) Allow configuring `--web.prefix-header` of query.

all.jsonnet

@@ -226,5 +226,5 @@ local finalQ = t.query(q.config {
   for name in std.objectFields(strs.shards[shard])
   if strs.shards[shard][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-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 }

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+:: {

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 },