From 445dac1fce0d3e425c6739cf95ff8fc363c93a0e Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Thu, 6 Feb 2020 14:22:38 +0100 Subject: [PATCH] jsonnet/kube-thanos: Adhere to kube app label definitions Signed-off-by: Frederic Branczyk --- .../all/manifests/thanos-bucket-deployment.yaml | 12 ++++++------ examples/all/manifests/thanos-bucket-service.yaml | 8 ++++---- examples/all/manifests/thanos-compact-service.yaml | 8 ++++---- .../manifests/thanos-compact-serviceMonitor.yaml | 8 ++++---- .../all/manifests/thanos-compact-statefulSet.yaml | 12 ++++++------ .../all/manifests/thanos-query-deployment.yaml | 14 +++++++------- examples/all/manifests/thanos-query-service.yaml | 8 ++++---- .../all/manifests/thanos-query-serviceMonitor.yaml | 8 ++++---- examples/all/manifests/thanos-receive-service.yaml | 8 ++++---- .../manifests/thanos-receive-serviceMonitor.yaml | 8 ++++---- .../all/manifests/thanos-receive-statefulSet.yaml | 12 ++++++------ examples/all/manifests/thanos-rule-service.yaml | 8 ++++---- .../all/manifests/thanos-rule-serviceMonitor.yaml | 8 ++++---- .../all/manifests/thanos-rule-statefulSet.yaml | 12 ++++++------ examples/all/manifests/thanos-store-service.yaml | 8 ++++---- .../all/manifests/thanos-store-serviceMonitor.yaml | 8 ++++---- .../all/manifests/thanos-store-statefulSet.yaml | 12 ++++++------ jsonnet/kube-thanos/kube-thanos-bucket.libsonnet | 4 ++-- jsonnet/kube-thanos/kube-thanos-compact.libsonnet | 4 ++-- jsonnet/kube-thanos/kube-thanos-query.libsonnet | 4 ++-- jsonnet/kube-thanos/kube-thanos-receive.libsonnet | 4 ++-- jsonnet/kube-thanos/kube-thanos-rule.libsonnet | 4 ++-- jsonnet/kube-thanos/kube-thanos-store.libsonnet | 4 ++-- manifests/thanos-query-deployment.yaml | 14 +++++++------- manifests/thanos-query-service.yaml | 8 ++++---- manifests/thanos-query-serviceMonitor.yaml | 8 ++++---- manifests/thanos-store-service.yaml | 8 ++++---- manifests/thanos-store-serviceMonitor.yaml | 8 ++++---- manifests/thanos-store-statefulSet.yaml | 12 ++++++------ 29 files changed, 122 insertions(+), 122 deletions(-) diff --git a/examples/all/manifests/thanos-bucket-deployment.yaml b/examples/all/manifests/thanos-bucket-deployment.yaml index 16b6063d..e439bf07 100644 --- a/examples/all/manifests/thanos-bucket-deployment.yaml +++ b/examples/all/manifests/thanos-bucket-deployment.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: thanos-bucket + app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-bucket app.kubernetes.io/version: v0.10.1 name: thanos-bucket namespace: thanos @@ -12,15 +12,15 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-bucket + app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-bucket template: metadata: labels: - app.kubernetes.io/component: thanos-bucket + app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-bucket app.kubernetes.io/version: v0.10.1 spec: containers: diff --git a/examples/all/manifests/thanos-bucket-service.yaml b/examples/all/manifests/thanos-bucket-service.yaml index bd7efd9a..598093f3 100644 --- a/examples/all/manifests/thanos-bucket-service.yaml +++ b/examples/all/manifests/thanos-bucket-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-bucket + app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-bucket app.kubernetes.io/version: v0.10.1 name: thanos-bucket namespace: thanos @@ -14,6 +14,6 @@ spec: port: 8080 targetPort: http selector: - app.kubernetes.io/component: thanos-bucket + app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-bucket diff --git a/examples/all/manifests/thanos-compact-service.yaml b/examples/all/manifests/thanos-compact-service.yaml index 0dc641e8..0340bd19 100644 --- a/examples/all/manifests/thanos-compact-service.yaml +++ b/examples/all/manifests/thanos-compact-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact app.kubernetes.io/version: v0.10.1 name: thanos-compact namespace: thanos @@ -14,6 +14,6 @@ spec: port: 10902 targetPort: http selector: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact diff --git a/examples/all/manifests/thanos-compact-serviceMonitor.yaml b/examples/all/manifests/thanos-compact-serviceMonitor.yaml index 6a2c4f3d..54c4c170 100644 --- a/examples/all/manifests/thanos-compact-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-compact-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact app.kubernetes.io/version: v0.10.1 name: thanos-compact namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact diff --git a/examples/all/manifests/thanos-compact-statefulSet.yaml b/examples/all/manifests/thanos-compact-statefulSet.yaml index af78d8e8..3840bd83 100644 --- a/examples/all/manifests/thanos-compact-statefulSet.yaml +++ b/examples/all/manifests/thanos-compact-statefulSet.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact app.kubernetes.io/version: v0.10.1 name: thanos-compact namespace: thanos @@ -12,16 +12,16 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact serviceName: thanos-compact template: metadata: labels: - app.kubernetes.io/component: thanos-compact + app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-compact app.kubernetes.io/version: v0.10.1 spec: containers: diff --git a/examples/all/manifests/thanos-query-deployment.yaml b/examples/all/manifests/thanos-query-deployment.yaml index 36928085..fa7f710e 100644 --- a/examples/all/manifests/thanos-query-deployment.yaml +++ b/examples/all/manifests/thanos-query-deployment.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 name: thanos-query namespace: thanos @@ -12,15 +12,15 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query template: metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 spec: affinity: @@ -32,7 +32,7 @@ spec: - key: app.kubernetes.io/name operator: In values: - - thanos + - thanos-query namespaces: - thanos topologyKey: kubernetes.io/hostname diff --git a/examples/all/manifests/thanos-query-service.yaml b/examples/all/manifests/thanos-query-service.yaml index 797b7bf0..1a9b314d 100644 --- a/examples/all/manifests/thanos-query-service.yaml +++ b/examples/all/manifests/thanos-query-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 name: thanos-query namespace: thanos @@ -17,6 +17,6 @@ spec: port: 9090 targetPort: http selector: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query diff --git a/examples/all/manifests/thanos-query-serviceMonitor.yaml b/examples/all/manifests/thanos-query-serviceMonitor.yaml index e185c224..798d8ba3 100644 --- a/examples/all/manifests/thanos-query-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-query-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 name: thanos-query namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query diff --git a/examples/all/manifests/thanos-receive-service.yaml b/examples/all/manifests/thanos-receive-service.yaml index 1371a3f3..0fae6d5d 100644 --- a/examples/all/manifests/thanos-receive-service.yaml +++ b/examples/all/manifests/thanos-receive-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive app.kubernetes.io/version: v0.10.1 name: thanos-receive namespace: thanos @@ -21,6 +21,6 @@ spec: port: 19291 targetPort: 19291 selector: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive diff --git a/examples/all/manifests/thanos-receive-serviceMonitor.yaml b/examples/all/manifests/thanos-receive-serviceMonitor.yaml index cb287522..f7b0368a 100644 --- a/examples/all/manifests/thanos-receive-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-receive-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive app.kubernetes.io/version: v0.10.1 name: thanos-receive namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml index d00855ba..c3e88f15 100644 --- a/examples/all/manifests/thanos-receive-statefulSet.yaml +++ b/examples/all/manifests/thanos-receive-statefulSet.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive app.kubernetes.io/version: v0.10.1 name: thanos-receive namespace: thanos @@ -12,16 +12,16 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive serviceName: thanos-receive template: metadata: labels: - app.kubernetes.io/component: thanos-receive + app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-receive app.kubernetes.io/version: v0.10.1 spec: affinity: diff --git a/examples/all/manifests/thanos-rule-service.yaml b/examples/all/manifests/thanos-rule-service.yaml index ef185117..8b9eafc8 100644 --- a/examples/all/manifests/thanos-rule-service.yaml +++ b/examples/all/manifests/thanos-rule-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule app.kubernetes.io/version: v0.10.1 name: thanos-rule namespace: thanos @@ -18,6 +18,6 @@ spec: port: 10902 targetPort: http selector: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule diff --git a/examples/all/manifests/thanos-rule-serviceMonitor.yaml b/examples/all/manifests/thanos-rule-serviceMonitor.yaml index fb16afe4..0aefc5c3 100644 --- a/examples/all/manifests/thanos-rule-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-rule-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule app.kubernetes.io/version: v0.10.1 name: thanos-rule namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule diff --git a/examples/all/manifests/thanos-rule-statefulSet.yaml b/examples/all/manifests/thanos-rule-statefulSet.yaml index 2d24cecd..6af718f6 100644 --- a/examples/all/manifests/thanos-rule-statefulSet.yaml +++ b/examples/all/manifests/thanos-rule-statefulSet.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule app.kubernetes.io/version: v0.10.1 name: thanos-rule namespace: thanos @@ -12,16 +12,16 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule serviceName: thanos-rule template: metadata: labels: - app.kubernetes.io/component: thanos-rule + app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-rule app.kubernetes.io/version: v0.10.1 spec: containers: diff --git a/examples/all/manifests/thanos-store-service.yaml b/examples/all/manifests/thanos-store-service.yaml index 3e27d984..3071a7b9 100644 --- a/examples/all/manifests/thanos-store-service.yaml +++ b/examples/all/manifests/thanos-store-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 name: thanos-store namespace: thanos @@ -18,6 +18,6 @@ spec: port: 10902 targetPort: 10902 selector: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store diff --git a/examples/all/manifests/thanos-store-serviceMonitor.yaml b/examples/all/manifests/thanos-store-serviceMonitor.yaml index c89700b3..e281892f 100644 --- a/examples/all/manifests/thanos-store-serviceMonitor.yaml +++ b/examples/all/manifests/thanos-store-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 name: thanos-store namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml index 96d22eef..ded23616 100644 --- a/examples/all/manifests/thanos-store-statefulSet.yaml +++ b/examples/all/manifests/thanos-store-statefulSet.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 name: thanos-store namespace: thanos @@ -12,16 +12,16 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store serviceName: thanos-store template: metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 spec: containers: diff --git a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet index d20a6e81..8e6a6adf 100644 --- a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet @@ -11,10 +11,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; objectStorageConfig: error 'must provide objectStorageConfig', commonLabels:: { - 'app.kubernetes.io/name': 'thanos', + 'app.kubernetes.io/name': 'thanos-bucket', 'app.kubernetes.io/instance': tb.config.name, 'app.kubernetes.io/version': tb.config.version, - 'app.kubernetes.io/component': 'thanos-bucket', + 'app.kubernetes.io/component': 'object-store-bucket-debugging', }, podLabelSelector:: { diff --git a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet index 5b76609d..4a927223 100644 --- a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet @@ -11,10 +11,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; objectStorageConfig: error 'must provide objectStorageConfig', commonLabels:: { - 'app.kubernetes.io/name': 'thanos', + 'app.kubernetes.io/name': 'thanos-compact', 'app.kubernetes.io/instance': tc.config.name, 'app.kubernetes.io/version': tc.config.version, - 'app.kubernetes.io/component': 'thanos-compact', + 'app.kubernetes.io/component': 'database-compactor', }, podLabelSelector:: { diff --git a/jsonnet/kube-thanos/kube-thanos-query.libsonnet b/jsonnet/kube-thanos/kube-thanos-query.libsonnet index c3802a68..ee41ec82 100644 --- a/jsonnet/kube-thanos/kube-thanos-query.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-query.libsonnet @@ -13,10 +13,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; stores: error 'must provide store addresses', commonLabels:: { - 'app.kubernetes.io/name': 'thanos', + 'app.kubernetes.io/name': 'thanos-query', 'app.kubernetes.io/instance': tq.config.name, 'app.kubernetes.io/version': tq.config.version, - 'app.kubernetes.io/component': 'thanos-query', + 'app.kubernetes.io/component': 'query-layer', }, podLabelSelector:: { diff --git a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet index fc55dc47..08cc0f6b 100644 --- a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet @@ -13,10 +13,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; objectStorageConfig: error 'must provide objectStorageConfig', commonLabels:: { - 'app.kubernetes.io/name': 'thanos', + 'app.kubernetes.io/name': 'thanos-receive', 'app.kubernetes.io/instance': tr.config.name, 'app.kubernetes.io/version': tr.config.version, - 'app.kubernetes.io/component': 'thanos-receive', + 'app.kubernetes.io/component': 'database-write-hashring', }, podLabelSelector:: { diff --git a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet index 59b5dcf2..24ab3ff4 100644 --- a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet @@ -15,10 +15,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; queriers: [], commonLabels:: { - 'app.kubernetes.io/name': 'thanos', + 'app.kubernetes.io/name': 'thanos-rule', 'app.kubernetes.io/instance': tr.config.name, 'app.kubernetes.io/version': tr.config.version, - 'app.kubernetes.io/component': 'thanos-rule', + 'app.kubernetes.io/component': 'rule-evaluation-engine', }, podLabelSelector:: { diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index 08447549..4660850f 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -12,10 +12,10 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; objectStorageConfig: error 'must provide objectStorageConfig', commonLabels:: { - 'app.kubernetes.io/name': 'thanos', + 'app.kubernetes.io/name': 'thanos-store', 'app.kubernetes.io/instance': ts.config.name, 'app.kubernetes.io/version': ts.config.version, - 'app.kubernetes.io/component': 'thanos-store', + 'app.kubernetes.io/component': 'object-store-gateway', }, podLabelSelector:: { diff --git a/manifests/thanos-query-deployment.yaml b/manifests/thanos-query-deployment.yaml index 107717d1..2838e653 100644 --- a/manifests/thanos-query-deployment.yaml +++ b/manifests/thanos-query-deployment.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 name: thanos-query namespace: thanos @@ -12,15 +12,15 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query template: metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 spec: affinity: @@ -32,7 +32,7 @@ spec: - key: app.kubernetes.io/name operator: In values: - - thanos + - thanos-query namespaces: - thanos topologyKey: kubernetes.io/hostname diff --git a/manifests/thanos-query-service.yaml b/manifests/thanos-query-service.yaml index 797b7bf0..1a9b314d 100644 --- a/manifests/thanos-query-service.yaml +++ b/manifests/thanos-query-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 name: thanos-query namespace: thanos @@ -17,6 +17,6 @@ spec: port: 9090 targetPort: http selector: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query diff --git a/manifests/thanos-query-serviceMonitor.yaml b/manifests/thanos-query-serviceMonitor.yaml index e185c224..798d8ba3 100644 --- a/manifests/thanos-query-serviceMonitor.yaml +++ b/manifests/thanos-query-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query app.kubernetes.io/version: v0.10.1 name: thanos-query namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-query + app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-query diff --git a/manifests/thanos-store-service.yaml b/manifests/thanos-store-service.yaml index 3e27d984..3071a7b9 100644 --- a/manifests/thanos-store-service.yaml +++ b/manifests/thanos-store-service.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 name: thanos-store namespace: thanos @@ -18,6 +18,6 @@ spec: port: 10902 targetPort: 10902 selector: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store diff --git a/manifests/thanos-store-serviceMonitor.yaml b/manifests/thanos-store-serviceMonitor.yaml index c89700b3..e281892f 100644 --- a/manifests/thanos-store-serviceMonitor.yaml +++ b/manifests/thanos-store-serviceMonitor.yaml @@ -2,9 +2,9 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 name: thanos-store namespace: thanos @@ -13,6 +13,6 @@ spec: - port: http selector: matchLabels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml index 96d22eef..ded23616 100644 --- a/manifests/thanos-store-statefulSet.yaml +++ b/manifests/thanos-store-statefulSet.yaml @@ -2,9 +2,9 @@ apiVersion: apps/v1 kind: StatefulSet metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 name: thanos-store namespace: thanos @@ -12,16 +12,16 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store serviceName: thanos-store template: metadata: labels: - app.kubernetes.io/component: thanos-store + app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store - app.kubernetes.io/name: thanos + app.kubernetes.io/name: thanos-store app.kubernetes.io/version: v0.10.1 spec: containers: