(compact|store)-shards/receive-hashrings: Hide non-resource fields

Signed-off-by: Maxime Brunet <maxime.brunet@paytm.com>
thanos-io · Sep 13, 2021 · fb056aa · fb056aa
1 parent cfd8d78
commit fb056aa
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 11 deletions.
diff --git 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
@@ -230,7 +230,7 @@ local finalQ = t.query(q.config {
 { ['thanos-bucket-replicate-' + name]: br[name] for name in std.objectFields(br) if br[name] != null } +
 { ['thanos-compact-' + name]: c[name] for name in std.objectFields(c) if c[name] != null } +
 {
-  ['compact-' + shard + '-' + name]: cs.shards[shard][name]
+  ['thanos-compact-' + shard + '-' + name]: cs.shards[shard][name]
   for shard in std.objectFields(cs.shards)
   for name in std.objectFields(cs.shards[shard])
   if cs.shards[shard][name] != null
@@ -248,13 +248,11 @@ local finalQ = t.query(q.config {
   if rcvs.hashrings[hashring][name] != null
 } +
 {
-  ['store-' + shard + '-' + name]: strs.shards[shard][name]
+  ['thanos-store-' + shard + '-' + name]: strs.shards[shard][name]
   for shard in std.objectFields(strs.shards)
   for name in std.objectFields(strs.shards[shard])
   if strs.shards[shard][name] != null
 } +
-{
-  'compact-shards-serviceMonitor': cs.serviceMonitor,
-  'store-shards-serviceMonitor': strs.serviceMonitor,
-  'receive-hashrings-serviceMonitor': rcvs.serviceMonitor,
-}
+{ ['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 }
diff --git a/...all/manifests/compact-shard0-service.yaml → ...ifests/thanos-compact-shard0-service.yaml b/...all/manifests/compact-shard0-service.yaml → ...ifests/thanos-compact-shard0-service.yaml
diff --git a/...manifests/compact-shard0-statefulSet.yaml → ...ts/thanos-compact-shard0-statefulSet.yaml b/...manifests/compact-shard0-statefulSet.yaml → ...ts/thanos-compact-shard0-statefulSet.yaml
diff --git a/...all/manifests/compact-shard1-service.yaml → ...ifests/thanos-compact-shard1-service.yaml b/...all/manifests/compact-shard1-service.yaml → ...ifests/thanos-compact-shard1-service.yaml
diff --git a/...manifests/compact-shard1-statefulSet.yaml → ...ts/thanos-compact-shard1-statefulSet.yaml b/...manifests/compact-shard1-statefulSet.yaml → ...ts/thanos-compact-shard1-statefulSet.yaml
diff --git a/...all/manifests/compact-shard2-service.yaml → ...ifests/thanos-compact-shard2-service.yaml b/...all/manifests/compact-shard2-service.yaml → ...ifests/thanos-compact-shard2-service.yaml
diff --git a/...manifests/compact-shard2-statefulSet.yaml → ...ts/thanos-compact-shard2-statefulSet.yaml b/...manifests/compact-shard2-statefulSet.yaml → ...ts/thanos-compact-shard2-statefulSet.yaml
diff --git a/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml b/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: database-compactor
+    app.kubernetes.io/instance: thanos-compact
+    app.kubernetes.io/name: thanos-compact
+    app.kubernetes.io/version: v0.22.0
+  name: thanos-compact
+  namespace: thanos
diff --git a/...ifests/compact-shards-serviceMonitor.yaml → ...thanos-compact-shards-serviceMonitor.yaml b/...ifests/compact-shards-serviceMonitor.yaml → ...thanos-compact-shards-serviceMonitor.yaml
diff --git a/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml b/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: database-write-hashring
+    app.kubernetes.io/instance: thanos-receive
+    app.kubernetes.io/name: thanos-receive
+    app.kubernetes.io/version: v0.22.0
+  name: thanos-receive
+  namespace: thanos
diff --git a/...sts/receive-hashrings-serviceMonitor.yaml → ...nos-receive-hashrings-serviceMonitor.yaml b/...sts/receive-hashrings-serviceMonitor.yaml → ...nos-receive-hashrings-serviceMonitor.yaml
diff --git a/...s/all/manifests/store-shard0-service.yaml → ...anifests/thanos-store-shard0-service.yaml b/...s/all/manifests/store-shard0-service.yaml → ...anifests/thanos-store-shard0-service.yaml
diff --git a/...l/manifests/store-shard0-statefulSet.yaml → ...ests/thanos-store-shard0-statefulSet.yaml b/...l/manifests/store-shard0-statefulSet.yaml → ...ests/thanos-store-shard0-statefulSet.yaml
diff --git a/...s/all/manifests/store-shard1-service.yaml → ...anifests/thanos-store-shard1-service.yaml b/...s/all/manifests/store-shard1-service.yaml → ...anifests/thanos-store-shard1-service.yaml
diff --git a/...l/manifests/store-shard1-statefulSet.yaml → ...ests/thanos-store-shard1-statefulSet.yaml b/...l/manifests/store-shard1-statefulSet.yaml → ...ests/thanos-store-shard1-statefulSet.yaml
diff --git a/...s/all/manifests/store-shard2-service.yaml → ...anifests/thanos-store-shard2-service.yaml b/...s/all/manifests/store-shard2-service.yaml → ...anifests/thanos-store-shard2-service.yaml
diff --git a/...l/manifests/store-shard2-statefulSet.yaml → ...ests/thanos-store-shard2-statefulSet.yaml b/...l/manifests/store-shard2-statefulSet.yaml → ...ests/thanos-store-shard2-statefulSet.yaml
diff --git a/examples/all/manifests/thanos-store-shards-serviceAccount.yaml b/examples/all/manifests/thanos-store-shards-serviceAccount.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: object-store-gateway
+    app.kubernetes.io/instance: thanos-store
+    app.kubernetes.io/name: thanos-store
+    app.kubernetes.io/version: v0.22.0
+  name: thanos-store
+  namespace: thanos
diff --git a/...anifests/store-shards-serviceMonitor.yaml → ...s/thanos-store-shards-serviceMonitor.yaml b/...anifests/store-shards-serviceMonitor.yaml → ...s/thanos-store-shards-serviceMonitor.yaml
diff --git 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
@@ -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
@@ -28,7 +28,7 @@ function(params)
       },
     },
 
-    shards: {
+    shards:: {
       ['shard' + i]: store(config {
         name+: '-%d' % i,
         commonLabels+:: { 'store.thanos.io/shard': 'shard-' + i },