Skip to content

Commit 606663c

Browse files
deejay1deejay1
authored
Add more extra containers options for tempo distributed (#51)
Signed-off-by: Łukasz Jernaś <[email protected]>
1 parent c7340ab commit 606663c

8 files changed

Lines changed: 32 additions & 2 deletions

File tree

‎charts/tempo-distributed/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 2.0.0
5+
version: 2.1.0
66
# renovate: docker=docker.io/grafana/tempo
77
appVersion: 2.10.0
88
kubeVersion: "^1.25.0-0"

‎charts/tempo-distributed/README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
3+
![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.0](https://img.shields.io/badge/AppVersion-2.10.0-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

@@ -616,6 +616,7 @@ The memcached default args are removed and should be provided manually. The sett
616616
| ingester.config.replication_factor | int | `3` | Number of copies of spans to store in the ingester ring |
617617
| ingester.config.trace_idle_period | string | `nil` | Amount of time a trace must be idle before flushing it to the wal. |
618618
| ingester.extraArgs | list | `[]` | Additional CLI args for the ingester |
619+
| ingester.extraContainers | list | `[]` | Containers to add to the ingester pods |
619620
| ingester.extraEnv | list | `[]` | Environment variables to add to the ingester pods |
620621
| ingester.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods |
621622
| ingester.extraVolumeMounts | list | `[]` | Extra volumes for ingester pods |
@@ -699,6 +700,7 @@ The memcached default args are removed and should be provided manually. The sett
699700
| memcached.affinity | string | Hard node and soft zone anti-affinity | Affinity for memcached pods. Passed through `tpl` and, thus, to be configured as string |
700701
| memcached.enabled | bool | `true` | Specified whether the memcached cachce should be enabled |
701702
| memcached.extraArgs | list | `[]` | Additional CLI args for memcached |
703+
| memcached.extraContainers | list | `[]` | Containers to add to the memcached pods |
702704
| memcached.extraEnv | list | `[]` | Environment variables to add to memcached pods |
703705
| memcached.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to memcached pods |
704706
| memcached.extraVolumeMounts | list | `[]` | Extra volumes for memcached pods |
@@ -775,6 +777,7 @@ The memcached default args are removed and should be provided manually. The sett
775777
| metricsGenerator.config.traces_storage | object | `{"path":"/var/tempo/traces"}` | Used by the local blocks processor to store a wal for traces. |
776778
| metricsGenerator.enabled | bool | `false` | Specifies whether a metrics-generator should be deployed |
777779
| metricsGenerator.extraArgs | list | `[]` | Additional CLI args for the metrics-generator |
780+
| metricsGenerator.extraContainers | list | `[]` | Containers to add to the metrics-generator pods |
778781
| metricsGenerator.extraEnv | list | `[]` | Environment variables to add to the metrics-generator pods |
779782
| metricsGenerator.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the metrics-generator pods |
780783
| metricsGenerator.extraVolumeMounts | list | `[]` | Extra volumes for metrics-generator pods |
@@ -876,6 +879,7 @@ The memcached default args are removed and should be provided manually. The sett
876879
| querier.config.search.query_timeout | string | `"30s"` | Timeout for search requests |
877880
| querier.config.trace_by_id.query_timeout | string | `"10s"` | Timeout for trace lookup requests |
878881
| querier.extraArgs | list | `[]` | Additional CLI args for the querier |
882+
| querier.extraContainers | list | `[]` | Containers to add to the querier pods |
879883
| querier.extraEnv | list | `[]` | Environment variables to add to the querier pods |
880884
| querier.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the querier pods |
881885
| querier.extraVolumeMounts | list | `[]` | Extra volumes for querier pods |
@@ -927,6 +931,7 @@ The memcached default args are removed and should be provided manually. The sett
927931
| queryFrontend.config.trace_by_id | object | `{"query_shards":50}` | Trace by ID lookup configuration |
928932
| queryFrontend.config.trace_by_id.query_shards | int | `50` | The number of shards to split a trace by id query into. |
929933
| queryFrontend.extraArgs | list | `[]` | Additional CLI args for the query-frontend |
934+
| queryFrontend.extraContainers | list | `[]` | Containers to add to the query-frontend pods |
930935
| queryFrontend.extraEnv | list | `[]` | Environment variables to add to the query-frontend pods |
931936
| queryFrontend.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the query-frontend pods |
932937
| queryFrontend.extraVolumeMounts | list | `[]` | Extra volumes for query-frontend pods |

‎charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ spec:
141141
{{- with .Values.ingester.extraVolumeMounts }}
142142
{{- toYaml . | nindent 12 }}
143143
{{- end }}
144+
{{- with .Values.ingester.extraContainers }}
145+
{{- toYaml . | nindent 8 }}
146+
{{- end }}
144147
terminationGracePeriodSeconds: {{ .Values.ingester.terminationGracePeriodSeconds }}
145148
{{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }}
146149
{{- with .Values.ingester.topologySpreadConstraints }}

‎charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ spec:
134134
{{- toYaml . | nindent 12 }}
135135
{{- end }}
136136
{{- end }}
137+
{{- with .Values.memcached.extraContainers }}
138+
{{- toYaml . | nindent 8 }}
139+
{{- end }}
137140
{{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }}
138141
{{- with .Values.memcached.topologySpreadConstraints }}
139142
topologySpreadConstraints:

‎charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ spec:
120120
{{- with .Values.metricsGenerator.extraVolumeMounts }}
121121
{{- toYaml . | nindent 12 }}
122122
{{- end }}
123+
{{- with .Values.metricsGenerator.extraContainers }}
124+
{{- toYaml . | nindent 8 }}
125+
{{- end }}
123126
terminationGracePeriodSeconds: {{ .Values.metricsGenerator.terminationGracePeriodSeconds }}
124127
{{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }}
125128
{{- with .Values.metricsGenerator.topologySpreadConstraints }}

‎charts/tempo-distributed/templates/querier/deployment-querier.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ spec:
123123
{{- with .Values.querier.extraVolumeMounts }}
124124
{{- toYaml . | nindent 12 }}
125125
{{- end }}
126+
{{- with .Values.querier.extraContainers }}
127+
{{- toYaml . | nindent 8 }}
128+
{{- end }}
126129
terminationGracePeriodSeconds: {{ .Values.querier.terminationGracePeriodSeconds }}
127130
{{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }}
128131
{{- with .Values.querier.topologySpreadConstraints }}

‎charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ spec:
166166
{{- toYaml . | nindent 12 }}
167167
{{- end }}
168168
{{- end}}
169+
{{- with .Values.queryFrontend.extraContainers }}
170+
{{- toYaml . | nindent 8 }}
171+
{{- end }}
169172
terminationGracePeriodSeconds: {{ .Values.queryFrontend.terminationGracePeriodSeconds }}
170173
{{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }}
171174
{{- with .Values.queryFrontend.topologySpreadConstraints }}

‎charts/tempo-distributed/values.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ ingester:
234234
extraVolumeMounts: []
235235
# -- Extra volumes for ingester deployment
236236
extraVolumes: []
237+
# -- Containers to add to the ingester pods
238+
extraContainers: []
237239
# -- Persistence configuration for ingester
238240
persistence:
239241
# -- Enable creating PVCs which is required when using boltdb-shipper
@@ -468,6 +470,8 @@ metricsGenerator:
468470
extraVolumeMounts: []
469471
# -- Extra volumes for metrics-generator deployment
470472
extraVolumes: []
473+
# -- Containers to add to the metrics-generator pods
474+
extraContainers: []
471475
persistentVolumeClaimRetentionPolicy:
472476
# -- Enable Persistent volume retention policy for StatefulSet
473477
enabled: false
@@ -924,6 +928,8 @@ querier:
924928
tolerations: []
925929
# -- Init containers for the querier pod
926930
initContainers: []
931+
# -- Containers to add to the querier pods
932+
extraContainers: []
927933
# -- Extra volumes for querier pods
928934
extraVolumeMounts: []
929935
# -- Extra volumes for querier deployment
@@ -1141,6 +1147,8 @@ queryFrontend:
11411147
tolerations: []
11421148
# -- Init containers for the query-frontend pod
11431149
initContainers: []
1150+
# -- Containers to add to the query-frontend pods
1151+
extraContainers: []
11441152
# -- Extra volumes for query-frontend pods
11451153
extraVolumeMounts: []
11461154
# -- Extra volumes for query-frontend deployment
@@ -1850,6 +1858,8 @@ memcached:
18501858
maxUnavailable: 1
18511859
# -- Init containers for the memcached pod
18521860
initContainers: []
1861+
# -- Containers to add to the memcached pods
1862+
extraContainers: []
18531863
# -- Extra volumes for memcached pods
18541864
extraVolumeMounts: []
18551865
# -- Extra volumes for memcached statefulSet

0 commit comments

Comments
 (0)