From f1928b820c19f1848dcd78178231deb716394933 Mon Sep 17 00:00:00 2001 From: Dreampuf Date: Mon, 18 Jul 2022 18:38:04 +0800 Subject: [PATCH] Add annotation support for serviceaccount (#271) --- CHANGELOG.md | 3 +++ .../all/manifests/thanos-bucket-replicate-serviceAccount.yaml | 1 + examples/all/manifests/thanos-bucket-serviceAccount.yaml | 1 + examples/all/manifests/thanos-compact-serviceAccount.yaml | 1 + .../all/manifests/thanos-compact-shards-serviceAccount.yaml | 1 + .../all/manifests/thanos-query-frontend-serviceAccount.yaml | 1 + examples/all/manifests/thanos-query-serviceAccount.yaml | 1 + .../all/manifests/thanos-receive-hashrings-serviceAccount.yaml | 1 + examples/all/manifests/thanos-receive-serviceAccount.yaml | 1 + examples/all/manifests/thanos-rule-serviceAccount.yaml | 1 + examples/all/manifests/thanos-store-serviceAccount.yaml | 1 + examples/all/manifests/thanos-store-shards-serviceAccount.yaml | 1 + jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet | 3 +++ jsonnet/kube-thanos/kube-thanos-bucket.libsonnet | 3 +++ .../kube-thanos/kube-thanos-compact-default-params.libsonnet | 2 ++ jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet | 1 + jsonnet/kube-thanos/kube-thanos-compact.libsonnet | 1 + jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet | 3 +++ jsonnet/kube-thanos/kube-thanos-query.libsonnet | 2 ++ .../kube-thanos/kube-thanos-receive-default-params.libsonnet | 2 ++ jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet | 1 + jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet | 1 + jsonnet/kube-thanos/kube-thanos-receive.libsonnet | 1 + jsonnet/kube-thanos/kube-thanos-rule.libsonnet | 3 +++ jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet | 2 ++ jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet | 1 + jsonnet/kube-thanos/kube-thanos-store.libsonnet | 1 + manifests/thanos-query-serviceAccount.yaml | 1 + manifests/thanos-receive-ingestor-serviceAccount.yaml | 1 + manifests/thanos-receive-router-serviceAccount.yaml | 1 + manifests/thanos-store-serviceAccount.yaml | 1 + 31 files changed, 45 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 239ee70..59242fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ We use *breaking* word for marking changes that are not backward compatible (rel ### Added +- [#263](https://github.com/thanos-io/kube-thanos/pull/263) Add support for stateless Rulers. +- [#271](https://github.com/thanos-io/kube-thanos/pull/271) Add annotation support for ServiceAccount. + ### Fixed ## [v0.27.0](https://github.com/thanos-io/kube-thanos/tree/v0.27.0) (2022-07-07) diff --git a/examples/all/manifests/thanos-bucket-replicate-serviceAccount.yaml b/examples/all/manifests/thanos-bucket-replicate-serviceAccount.yaml index 83fcad9..84c05e1 100644 --- a/examples/all/manifests/thanos-bucket-replicate-serviceAccount.yaml +++ b/examples/all/manifests/thanos-bucket-replicate-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: object-store-bucket-replicate app.kubernetes.io/instance: thanos-bucket-replicate diff --git a/examples/all/manifests/thanos-bucket-serviceAccount.yaml b/examples/all/manifests/thanos-bucket-serviceAccount.yaml index 58cf43b..50a9936 100644 --- a/examples/all/manifests/thanos-bucket-serviceAccount.yaml +++ b/examples/all/manifests/thanos-bucket-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: object-store-bucket-debugging app.kubernetes.io/instance: thanos-bucket diff --git a/examples/all/manifests/thanos-compact-serviceAccount.yaml b/examples/all/manifests/thanos-compact-serviceAccount.yaml index 6c59fc8..fa66bc3 100644 --- a/examples/all/manifests/thanos-compact-serviceAccount.yaml +++ b/examples/all/manifests/thanos-compact-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact diff --git a/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml b/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml index 6c59fc8..fa66bc3 100644 --- a/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml +++ b/examples/all/manifests/thanos-compact-shards-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: database-compactor app.kubernetes.io/instance: thanos-compact diff --git a/examples/all/manifests/thanos-query-frontend-serviceAccount.yaml b/examples/all/manifests/thanos-query-frontend-serviceAccount.yaml index e2468bb..808a3d2 100644 --- a/examples/all/manifests/thanos-query-frontend-serviceAccount.yaml +++ b/examples/all/manifests/thanos-query-frontend-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: query-cache app.kubernetes.io/instance: thanos-query-frontend diff --git a/examples/all/manifests/thanos-query-serviceAccount.yaml b/examples/all/manifests/thanos-query-serviceAccount.yaml index 99387b5..6208973 100644 --- a/examples/all/manifests/thanos-query-serviceAccount.yaml +++ b/examples/all/manifests/thanos-query-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query diff --git a/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml b/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml index 2b1ddd5..c624b51 100644 --- a/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml +++ b/examples/all/manifests/thanos-receive-hashrings-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive diff --git a/examples/all/manifests/thanos-receive-serviceAccount.yaml b/examples/all/manifests/thanos-receive-serviceAccount.yaml index 2b1ddd5..c624b51 100644 --- a/examples/all/manifests/thanos-receive-serviceAccount.yaml +++ b/examples/all/manifests/thanos-receive-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive diff --git a/examples/all/manifests/thanos-rule-serviceAccount.yaml b/examples/all/manifests/thanos-rule-serviceAccount.yaml index 8457998..149fbf7 100644 --- a/examples/all/manifests/thanos-rule-serviceAccount.yaml +++ b/examples/all/manifests/thanos-rule-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: rule-evaluation-engine app.kubernetes.io/instance: thanos-rule diff --git a/examples/all/manifests/thanos-store-serviceAccount.yaml b/examples/all/manifests/thanos-store-serviceAccount.yaml index 0b12440..c5b589e 100644 --- a/examples/all/manifests/thanos-store-serviceAccount.yaml +++ b/examples/all/manifests/thanos-store-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store diff --git a/examples/all/manifests/thanos-store-shards-serviceAccount.yaml b/examples/all/manifests/thanos-store-shards-serviceAccount.yaml index 0b12440..c5b589e 100644 --- a/examples/all/manifests/thanos-store-shards-serviceAccount.yaml +++ b/examples/all/manifests/thanos-store-shards-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store diff --git a/jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet index 9ac6367..d9a5aa3 100644 --- a/jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-bucket-replicate.libsonnet @@ -40,6 +40,8 @@ local defaults = { fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, }; function(params) { @@ -82,6 +84,7 @@ function(params) { name: tbr.config.name, namespace: tbr.config.namespace, labels: tbr.config.commonLabels, + annotations: tbr.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet index 759e8a0..364efb4 100644 --- a/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-bucket.libsonnet @@ -35,6 +35,8 @@ local defaults = { fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, }; function(params) { @@ -77,6 +79,7 @@ function(params) { name: tb.config.name, namespace: tb.config.namespace, labels: tb.config.commonLabels, + annotations: tb.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-compact-default-params.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact-default-params.libsonnet index c79a351..69b3643 100644 --- a/jsonnet/kube-thanos/kube-thanos-compact-default-params.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-compact-default-params.libsonnet @@ -45,4 +45,6 @@ fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, } diff --git a/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet index 694aacd..3ae7311 100644 --- a/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-compact-shards.libsonnet @@ -26,6 +26,7 @@ function(params) name: config.name, namespace: config.namespace, labels: config.commonLabels, + annotations: config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet index 4c04bd5..298a047 100644 --- a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet @@ -47,6 +47,7 @@ function(params) { name: tc.config.name, namespace: tc.config.namespace, labels: tc.config.commonLabels, + annotations: tc.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet b/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet index 28d696e..392bb2f 100644 --- a/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet @@ -64,6 +64,8 @@ local defaults = { fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, }; function(params) { @@ -133,6 +135,7 @@ function(params) { name: tqf.config.name, namespace: tqf.config.namespace, labels: tqf.config.commonLabels, + annotations: tqf.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-query.libsonnet b/jsonnet/kube-thanos/kube-thanos-query.libsonnet index 8031c77..005fa57 100644 --- a/jsonnet/kube-thanos/kube-thanos-query.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-query.libsonnet @@ -45,6 +45,7 @@ local defaults = { fsGroup: 65534, runAsUser: 65534, }, + serviceAccountAnnotations:: {}, }; function(params) { @@ -92,6 +93,7 @@ function(params) { name: tq.config.name, namespace: tq.config.namespace, labels: tq.config.commonLabels, + annotations: tq.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet index 363801c..8036181 100644 --- a/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet @@ -52,4 +52,6 @@ fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, } diff --git a/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet index 97b592a..ea7dee2 100644 --- a/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-receive-hashrings.libsonnet @@ -28,6 +28,7 @@ function(params) name: config.name, namespace: config.namespace, labels: config.commonLabels, + annotations: config.serviceAccountAnnotations, }, }, hashrings: { diff --git a/jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet index 525f333..b30490d 100644 --- a/jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-receive-router.libsonnet @@ -39,6 +39,7 @@ function(params) { name: tr.config.name + '-router', namespace: tr.config.namespace, labels: tr.routerLabels, + annotations: tr.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet index 2fc88ba..0848eab 100644 --- a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet @@ -45,6 +45,7 @@ function(params) { name: tr.config.name, namespace: tr.config.namespace, labels: tr.config.commonLabels, + annotations: tr.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet index 3ff2474..2dbb254 100644 --- a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet @@ -50,6 +50,8 @@ local defaults = { fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, }; function(params) { @@ -103,6 +105,7 @@ function(params) { name: tr.config.name, namespace: tr.config.namespace, labels: tr.config.commonLabels, + annotations: tr.config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet b/jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet index 3cfa6cb..a989c0c 100644 --- a/jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet @@ -74,4 +74,6 @@ fsGroup: 65534, runAsUser: 65534, }, + + serviceAccountAnnotations:: {}, } diff --git a/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet b/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet index 1172cc9..6fcabc0 100644 --- a/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store-shards.libsonnet @@ -25,6 +25,7 @@ function(params) name: config.name, namespace: config.namespace, labels: config.commonLabels, + annotations: config.serviceAccountAnnotations, }, }, diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet index 99df2aa..faad418 100644 --- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet @@ -59,6 +59,7 @@ function(params) { name: ts.config.name, namespace: ts.config.namespace, labels: ts.config.commonLabels, + annotations: ts.config.serviceAccountAnnotations, }, }, diff --git a/manifests/thanos-query-serviceAccount.yaml b/manifests/thanos-query-serviceAccount.yaml index 6631bcc..6f8ba0d 100644 --- a/manifests/thanos-query-serviceAccount.yaml +++ b/manifests/thanos-query-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: query-layer app.kubernetes.io/instance: thanos-query diff --git a/manifests/thanos-receive-ingestor-serviceAccount.yaml b/manifests/thanos-receive-ingestor-serviceAccount.yaml index 8d35c92..3f1957d 100644 --- a/manifests/thanos-receive-ingestor-serviceAccount.yaml +++ b/manifests/thanos-receive-ingestor-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: database-write-hashring app.kubernetes.io/instance: thanos-receive-ingestor diff --git a/manifests/thanos-receive-router-serviceAccount.yaml b/manifests/thanos-receive-router-serviceAccount.yaml index b92f391..f92e7af 100644 --- a/manifests/thanos-receive-router-serviceAccount.yaml +++ b/manifests/thanos-receive-router-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: thanos-receive-router app.kubernetes.io/instance: thanos-receive diff --git a/manifests/thanos-store-serviceAccount.yaml b/manifests/thanos-store-serviceAccount.yaml index 823a1cd..1fe1fbf 100644 --- a/manifests/thanos-store-serviceAccount.yaml +++ b/manifests/thanos-store-serviceAccount.yaml @@ -1,6 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: + annotations: {} labels: app.kubernetes.io/component: object-store-gateway app.kubernetes.io/instance: thanos-store