Skip to content

[tempo-distributed] align usage of globa.extraArgs and globa.extraEnvFrom across. #3811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 26, 2025
Merged

[tempo-distributed] align usage of globa.extraArgs and globa.extraEnvFrom across. #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7d5cbb
[tempo-distributed]: align usage of globa.extraArgs and globa.extraEn…
KyriosGN0 Jul 18, 2025
346f319
fix lint issues
KyriosGN0 Jul 18, 2025
e275075
bump chart version
KyriosGN0 Jul 29, 2025
b5f4f57
bump chart version
KyriosGN0 Aug 9, 2025
14641ca
bump chart version
KyriosGN0 Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.46.5
version: 1.47.0
appVersion: 2.8.2
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
4 changes: 3 additions & 1 deletion charts/tempo-distributed/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.46.5](https://img.shields.io/badge/Version-1.46.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)
![Version: 1.47.0](https://img.shields.io/badge/Version-1.47.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -555,7 +555,9 @@ The memcached default args are removed and should be provided manually. The sett
| global.clusterDomain | string | `"cluster.local"` | configures cluster domain ("cluster.local" by default) |
| global.dnsNamespace | string | `"kube-system"` | configures DNS service namespace |
| global.dnsService | string | `"kube-dns"` | configures DNS service name |
| global.extraArgs | list | `[]` | Common args to add to all pods directly managed by this chart. scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen |
| global.extraEnv | list | `[]` | Common environment variables to add to all pods directly managed by this chart. scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen |
| global.extraEnvFrom | list | `[]` | Common environment variables which come from a ConfigMap or Secret to add to all pods directly managed by this chart. scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen |
| global.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets for all images, excluding enterprise. Names of existing secrets with private container registry credentials. Ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod Example: pullSecrets: [ my-dockerconfigjson-secret ] |
| global.image.registry | string | `"docker.io"` | Overrides the Docker registry globally for all images, excluding enterprise. |
| global.priorityClassName | string | `nil` | Overrides the priorityClassName for all pods |
Expand Down
3 changes: 3 additions & 0 deletions charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ spec:
{{- range $key, $value := .Values.adminApi.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
{{- range $key, $value := .Values.global.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
volumeMounts:
- mountPath: /conf
name: config
Expand Down
12 changes: 10 additions & 2 deletions charts/tempo-distributed/templates/compactor/deployment-compactor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ spec:
{{- with .Values.compactor.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: compactor
Expand All @@ -83,9 +86,14 @@ spec:
{{ toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.compactor.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.compactor.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.compactor.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
resources:
{{- toYaml .Values.compactor.resources | nindent 12 }}
Expand Down
14 changes: 11 additions & 3 deletions charts/tempo-distributed/templates/distributor/deployment-distributor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
{{- with .Values.distributor.strategy }}
strategy:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
template:
metadata:
labels:
Expand Down Expand Up @@ -68,6 +68,9 @@ spec:
{{- with .Values.distributor.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: distributor
Expand Down Expand Up @@ -126,9 +129,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.distributor.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.distributor.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.distributor.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
readinessProbe:
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
Expand Down
14 changes: 11 additions & 3 deletions ...-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ spec:
{{- with .Values.enterpriseFederationFrontend.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: federation-frontend
Expand All @@ -80,9 +83,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.enterpriseFederationFrontend.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.enterpriseFederationFrontend.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.enterpriseFederationFrontend.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
resources:
{{- toYaml .Values.enterpriseFederationFrontend.resources | nindent 12 }}
Expand Down Expand Up @@ -134,4 +142,4 @@ spec:
{{- with .Values.enterpriseFederationFrontend.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ spec:
{{- range $key, $value := .Values.enterpriseGateway.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
{{- range $key, $value := .Values.global.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
volumeMounts:
{{- if .Values.enterpriseGateway.extraVolumeMounts }}
{{ toYaml .Values.enterpriseGateway.extraVolumeMounts | nindent 12}}
Expand Down
9 changes: 7 additions & 2 deletions charts/tempo-distributed/templates/gateway/deployment-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.gateway.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.gateway.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.gateway.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
readinessProbe:
{{- toYaml .Values.gateway.readinessProbe | nindent 12 }}
Expand Down
12 changes: 10 additions & 2 deletions charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ spec:
{{- with .Values.ingester.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: ingester
Expand All @@ -98,9 +101,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.ingester.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.ingester.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.ingester.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
readinessProbe:
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
Expand Down
9 changes: 7 additions & 2 deletions charts/tempo-distributed/templates/memcached/statefulset-memcached.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.memcached.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.memcached.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.memcached.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.memcached.readinessProbe }}
readinessProbe:
Expand Down
12 changes: 10 additions & 2 deletions charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ spec:
{{- with .Values.metricsGenerator.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: metrics-generator
Expand All @@ -84,9 +87,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.metricsGenerator.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.metricsGenerator.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.metricsGenerator.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
readinessProbe:
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}
Expand Down
12 changes: 10 additions & 2 deletions charts/tempo-distributed/templates/querier/deployment-querier.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ spec:
{{- with .Values.querier.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.imageReference" $dict }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: querier
Expand All @@ -84,9 +87,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.querier.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.querier.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.querier.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
resources:
{{- toYaml .Values.querier.resources | nindent 12 }}
Expand Down
12 changes: 10 additions & 2 deletions charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,14 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.queryFrontend.extraEnvFrom }}
{{- if or .Values.global.extraEnvFrom .Values.queryFrontend.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
{{- with .Values.global.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.queryFrontend.extraEnvFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
resources:
{{- toYaml .Values.queryFrontend.resources | nindent 12 }}
Expand Down Expand Up @@ -113,6 +118,9 @@ spec:
{{- with .Values.queryFrontend.query.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.global.extraArgs }}
{{- toYaml . | nindent 12 }}
{{- end }}
image: {{ include "tempo.queryImage" . }}
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
name: tempo-query
Expand Down
5 changes: 4 additions & 1 deletion charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.tokengenJob.storeTokenInSecret }}
initContainers:
initContainers:
{{- if .Values.tokengenJob.initContainers }}
{{- toYaml .Values.tokengenJob.initContainers | nindent 8 }}
{{- end }}
Expand All @@ -60,6 +60,9 @@ spec:
{{- range $key, $value := .Values.tokengenJob.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
{{- range $key, $value := .Values.global.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
volumeMounts:
- mountPath: /conf
name: config
Expand Down
6 changes: 6 additions & 0 deletions charts/tempo-distributed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ global:
# -- Common environment variables to add to all pods directly managed by this chart.
# scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen
extraEnv: []
# -- Common environment variables which come from a ConfigMap or Secret to add to all pods directly managed by this chart.
# scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen
extraEnvFrom: []
# -- Common args to add to all pods directly managed by this chart.
# scope: admin-api, compactor, distributor, enterprise-federation-frontend, gateway, ingester, memcached, metrics-generator, querier, query-frontend, tokengen
extraArgs: []
# -- Global storage class to be used for persisted components
storageClass: null
fullnameOverride: ''
Expand Down
Loading