Add annotation support for serviceaccount (#271)

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

jsonnet/kube-thanos/kube-thanos-compact-default-params.libsonnet

@@ -45,4 +45,6 @@
     fsGroup: 65534,
     runAsUser: 65534,
   },
+
+  serviceAccountAnnotations:: {},
 }

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

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

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

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

jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet

@@ -52,4 +52,6 @@
     fsGroup: 65534,
     runAsUser: 65534,
   },
+
+  serviceAccountAnnotations:: {},
 }

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

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

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

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

jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet

@@ -74,4 +74,6 @@
     fsGroup: 65534,
     runAsUser: 65534,
   },
+
+  serviceAccountAnnotations:: {},
 }

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

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

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

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

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

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