Support configure annotations (observatorium#70)

Signed-off-by: clyang82 <[email protected]>
saswatamcode · Mar 7, 2022 · f9eb849 · f9eb849
1 parent 4093e6d
commit f9eb849
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 0 deletions.
diff --git a/api/v1alpha1/observatorium_types.go b/api/v1alpha1/observatorium_types.go
@@ -152,6 +152,9 @@ type ReceiversSpec struct {
 	// How long to retain raw samples on local storage
 	// +optional
 	Retention string `json:"retention,omitempty"`
+	// Annotations is an unstructured key value map stored with a service account
+	// +optional
+	ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
 }
 
 type StoreSpec struct {
@@ -166,6 +169,9 @@ type StoreSpec struct {
 	// ServiceMonitor enables servicemonitor.
 	// +optional
 	ServiceMonitor bool `json:"serviceMonitor,omitempty"`
+	// Annotations is an unstructured key value map stored with a service account
+	// +optional
+	ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
 }
 
 // MemCacheSpec describes configuration for Store Memcached
@@ -353,6 +359,9 @@ type QuerySpec struct {
 	// The maximum lookback duration for retrieving metrics during expression evaluations.
 	// +optional
 	LookbackDelta string `json:"lookbackDelta,omitempty"`
+	// Annotations is an unstructured key value map stored with a service account
+	// +optional
+	ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
 }
 
 type RuleConfig struct {
@@ -428,6 +437,9 @@ type RuleSpec struct {
 	// Evaluation interval
 	// +optional
 	EvalInterval string `json:"evalInterval,omitempty"`
+	// Annotations is an unstructured key value map stored with a service account
+	// +optional
+	ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
 }
 
 type CompactSpec struct {
@@ -452,6 +464,8 @@ type CompactSpec struct {
 	// Time before a block marked for deletion is deleted from bucket
 	// +optional
 	DeleteDelay string `json:"deleteDelay,omitempty"`
+	// Annotations is an unstructured key value map stored with a service account
+	ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
 }
 
 type VolumeClaimTemplate struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/jsonnet/obs-operator.jsonnet b/jsonnet/obs-operator.jsonnet
@@ -168,6 +168,26 @@ local operatorObs = obs {
       if (v.kind == 'StatefulSet' && std.startsWith(v.metadata.name, cr.metadata.name + '-thanos-query-frontend-memcached')) then {
         name: 'observability-thanos-query-frontend-memcached',
       } else {}
+    ) + (
+      if (std.objectHas(cr.spec.thanos.compact, 'serviceAccountAnnotations') && v.kind == 'ServiceAccount' && std.startsWith(v.metadata.name, cr.metadata.name + '-thanos-compact')) then {
+        annotations+: cr.spec.thanos.compact.serviceAccountAnnotations,
+      } else {}
+    ) + (
+      if (std.objectHas(cr.spec.thanos.query, 'serviceAccountAnnotations') && v.kind == 'ServiceAccount' && std.startsWith(v.metadata.name, cr.metadata.name + '-thanos-query')) then {
+        annotations+: cr.spec.thanos.query.serviceAccountAnnotations,
+      } else {}
+    ) + (
+      if (std.objectHas(cr.spec.thanos.store, 'serviceAccountAnnotations') && v.kind == 'ServiceAccount' && std.startsWith(v.metadata.name, cr.metadata.name + '-thanos-store-shard')) then {
+        annotations+: cr.spec.thanos.store.serviceAccountAnnotations,
+      } else {}
+    ) + (
+      if (std.objectHas(cr.spec.thanos.receivers, 'serviceAccountAnnotations') && v.kind == 'ServiceAccount' && std.startsWith(v.metadata.name, cr.metadata.name + '-thanos-receive')) then {
+        annotations+: cr.spec.thanos.store.serviceAccountAnnotations,
+      } else {}
+    ) + (
+      if (std.objectHas(cr.spec.thanos.rule, 'serviceAccountAnnotations') && v.kind == 'ServiceAccount' && std.startsWith(v.metadata.name, cr.metadata.name + '-thanos-rule')) then {
+        annotations+: cr.spec.thanos.store.serviceAccountAnnotations,
+      } else {}
     ),
     spec+: (
       if (std.objectHas(cr.spec, 'nodeSelector') && (v.kind == 'StatefulSet' || v.kind == 'Deployment')) then {

diff --git a/manifests/crds/core.observatorium.io_observatoria.yaml b/manifests/crds/core.observatorium.io_observatoria.yaml
@@ -901,6 +901,11 @@ spec:
                       retentionResolutionRaw:
                         description: RetentionResolutionRaw
                         type: string
+                      serviceAccountAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations is an unstructured key value map stored with a service account
+                        type: object
                       serviceMonitor:
                         description: ServiceMonitor enables servicemonitor.
                         type: boolean
@@ -1040,6 +1045,11 @@ spec:
                             description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                             type: object
                         type: object
+                      serviceAccountAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations is an unstructured key value map stored with a service account
+                        type: object
                       serviceMonitor:
                         description: ServiceMonitor enables servicemonitor.
                         type: boolean
@@ -1235,6 +1245,11 @@ spec:
                       retention:
                         description: How long to retain raw samples on local storage
                         type: string
+                      serviceAccountAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations is an unstructured key value map stored with a service account
+                        type: object
                       serviceMonitor:
                         description: ServiceMonitor enables servicemonitor.
                         type: boolean
@@ -1455,6 +1470,11 @@ spec:
                           - name
                           type: object
                         type: array
+                      serviceAccountAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations is an unstructured key value map stored with a service account
+                        type: object
                       serviceMonitor:
                         description: ServiceMonitor enables servicemonitor.
                         type: boolean
@@ -1662,6 +1682,11 @@ spec:
                             description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                             type: object
                         type: object
+                      serviceAccountAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations is an unstructured key value map stored with a service account
+                        type: object
                       serviceMonitor:
                         description: ServiceMonitor enables servicemonitor.
                         type: boolean