Skip to content

Commit e2fab90

Browse files
mapnomapno
authored
Merge pull request #3811 from KyriosGN0/global
[tempo-distributed] align usage of globa.extraArgs and globa.extraEnvFrom across.
2 parents 2e8f2bc + 14641ca commit e2fab90

File tree

15 files changed

+106
-23
lines changed

15 files changed

+106
-23
lines changed

‎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: 1.46.5
5+
version: 1.47.0
66
appVersion: 2.8.2
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/

‎charts/tempo-distributed/README.md‎

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

3-
![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)
3+
![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)
44

55
Grafana Tempo in MicroService mode
66

@@ -555,7 +555,9 @@ The memcached default args are removed and should be provided manually. The sett
555555
| global.clusterDomain | string | `"cluster.local"` | configures cluster domain ("cluster.local" by default) |
556556
| global.dnsNamespace | string | `"kube-system"` | configures DNS service namespace |
557557
| global.dnsService | string | `"kube-dns"` | configures DNS service name |
558+
| 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 |
558559
| 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 |
560+
| 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 |
559561
| 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 ] |
560562
| global.image.registry | string | `"docker.io"` | Overrides the Docker registry globally for all images, excluding enterprise. |
561563
| global.priorityClassName | string | `nil` | Overrides the priorityClassName for all pods |

‎charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ spec:
5353
{{- range $key, $value := .Values.adminApi.extraArgs }}
5454
- "-{{ $key }}={{ $value }}"
5555
{{- end }}
56+
{{- range $key, $value := .Values.global.extraArgs }}
57+
- "-{{ $key }}={{ $value }}"
58+
{{- end }}
5659
volumeMounts:
5760
- mountPath: /conf
5861
name: config

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ spec:
6666
{{- with .Values.compactor.extraArgs }}
6767
{{- toYaml . | nindent 12 }}
6868
{{- end }}
69+
{{- with .Values.global.extraArgs }}
70+
{{- toYaml . | nindent 12 }}
71+
{{- end }}
6972
image: {{ include "tempo.imageReference" $dict }}
7073
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
7174
name: compactor
@@ -83,9 +86,14 @@ spec:
8386
{{ toYaml . | nindent 12 }}
8487
{{- end }}
8588
{{- end }}
86-
{{- with .Values.compactor.extraEnvFrom }}
89+
{{- if or .Values.global.extraEnvFrom .Values.compactor.extraEnvFrom }}
8790
envFrom:
88-
{{- toYaml . | nindent 12 }}
91+
{{- with .Values.compactor.extraEnvFrom }}
92+
{{- toYaml . | nindent 12 }}
93+
{{- end }}
94+
{{- with .Values.global.extraEnvFrom }}
95+
{{- toYaml . | nindent 12 }}
96+
{{- end }}
8997
{{- end }}
9098
resources:
9199
{{- toYaml .Values.compactor.resources | nindent 12 }}

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
{{- with .Values.distributor.strategy }}
2323
strategy:
2424
{{- toYaml . | nindent 4 }}
25-
{{- end }}
25+
{{- end }}
2626
template:
2727
metadata:
2828
labels:
@@ -68,6 +68,9 @@ spec:
6868
{{- with .Values.distributor.extraArgs }}
6969
{{- toYaml . | nindent 12 }}
7070
{{- end }}
71+
{{- with .Values.global.extraArgs }}
72+
{{- toYaml . | nindent 12 }}
73+
{{- end }}
7174
image: {{ include "tempo.imageReference" $dict }}
7275
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
7376
name: distributor
@@ -126,9 +129,14 @@ spec:
126129
{{- toYaml . | nindent 12 }}
127130
{{- end }}
128131
{{- end }}
129-
{{- with .Values.distributor.extraEnvFrom }}
132+
{{- if or .Values.global.extraEnvFrom .Values.distributor.extraEnvFrom }}
130133
envFrom:
131-
{{- toYaml . | nindent 12 }}
134+
{{- with .Values.distributor.extraEnvFrom }}
135+
{{- toYaml . | nindent 12 }}
136+
{{- end }}
137+
{{- with .Values.global.extraEnvFrom }}
138+
{{- toYaml . | nindent 12 }}
139+
{{- end }}
132140
{{- end }}
133141
readinessProbe:
134142
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}

‎charts/tempo-distributed/templates/enterprise-federation-frontend/deployment-federation-frontend.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ spec:
6565
{{- with .Values.enterpriseFederationFrontend.extraArgs }}
6666
{{- toYaml . | nindent 12 }}
6767
{{- end }}
68+
{{- with .Values.global.extraArgs }}
69+
{{- toYaml . | nindent 12 }}
70+
{{- end }}
6871
image: {{ include "tempo.imageReference" $dict }}
6972
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
7073
name: federation-frontend
@@ -80,9 +83,14 @@ spec:
8083
{{- toYaml . | nindent 12 }}
8184
{{- end }}
8285
{{- end }}
83-
{{- with .Values.enterpriseFederationFrontend.extraEnvFrom }}
86+
{{- if or .Values.global.extraEnvFrom .Values.enterpriseFederationFrontend.extraEnvFrom }}
8487
envFrom:
85-
{{- toYaml . | nindent 12 }}
88+
{{- with .Values.enterpriseFederationFrontend.extraEnvFrom }}
89+
{{- toYaml . | nindent 12 }}
90+
{{- end }}
91+
{{- with .Values.global.extraEnvFrom }}
92+
{{- toYaml . | nindent 12 }}
93+
{{- end }}
8694
{{- end }}
8795
resources:
8896
{{- toYaml .Values.enterpriseFederationFrontend.resources | nindent 12 }}
@@ -134,4 +142,4 @@ spec:
134142
{{- with .Values.enterpriseFederationFrontend.extraVolumes }}
135143
{{- toYaml . | nindent 8 }}
136144
{{- end }}
137-
{{- end }}
145+
{{- end }}

‎charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ spec:
5151
{{- range $key, $value := .Values.enterpriseGateway.extraArgs }}
5252
- "-{{ $key }}={{ $value }}"
5353
{{- end }}
54+
{{- range $key, $value := .Values.global.extraArgs }}
55+
- "-{{ $key }}={{ $value }}"
56+
{{- end }}
5457
volumeMounts:
5558
{{- if .Values.enterpriseGateway.extraVolumeMounts }}
5659
{{ toYaml .Values.enterpriseGateway.extraVolumeMounts | nindent 12}}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,14 @@ spec:
7676
{{- toYaml . | nindent 12 }}
7777
{{- end }}
7878
{{- end }}
79-
{{- with .Values.gateway.extraEnvFrom }}
79+
{{- if or .Values.global.extraEnvFrom .Values.gateway.extraEnvFrom }}
8080
envFrom:
81-
{{- toYaml . | nindent 12 }}
81+
{{- with .Values.gateway.extraEnvFrom }}
82+
{{- toYaml . | nindent 12 }}
83+
{{- end }}
84+
{{- with .Values.global.extraEnvFrom }}
85+
{{- toYaml . | nindent 12 }}
86+
{{- end }}
8287
{{- end }}
8388
readinessProbe:
8489
{{- toYaml .Values.gateway.readinessProbe | nindent 12 }}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ spec:
7979
{{- with .Values.ingester.extraArgs }}
8080
{{- toYaml . | nindent 12 }}
8181
{{- end }}
82+
{{- with .Values.global.extraArgs }}
83+
{{- toYaml . | nindent 12 }}
84+
{{- end }}
8285
image: {{ include "tempo.imageReference" $dict }}
8386
imagePullPolicy: {{ .Values.tempo.image.pullPolicy }}
8487
name: ingester
@@ -98,9 +101,14 @@ spec:
98101
{{- toYaml . | nindent 12 }}
99102
{{- end }}
100103
{{- end }}
101-
{{- with .Values.ingester.extraEnvFrom }}
104+
{{- if or .Values.global.extraEnvFrom .Values.ingester.extraEnvFrom }}
102105
envFrom:
103-
{{- toYaml . | nindent 12 }}
106+
{{- with .Values.global.extraEnvFrom }}
107+
{{- toYaml . | nindent 12 }}
108+
{{- end }}
109+
{{- with .Values.ingester.extraEnvFrom }}
110+
{{- toYaml . | nindent 12 }}
111+
{{- end }}
104112
{{- end }}
105113
readinessProbe:
106114
{{- toYaml .Values.tempo.readinessProbe | nindent 12 }}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,14 @@ spec:
7373
{{- toYaml . | nindent 12 }}
7474
{{- end }}
7575
{{- end }}
76-
{{- with .Values.memcached.extraEnvFrom }}
76+
{{- if or .Values.global.extraEnvFrom .Values.memcached.extraEnvFrom }}
7777
envFrom:
78-
{{- toYaml . | nindent 12 }}
78+
{{- with .Values.global.extraEnvFrom }}
79+
{{- toYaml . | nindent 12 }}
80+
{{- end }}
81+
{{- with .Values.memcached.extraEnvFrom }}
82+
{{- toYaml . | nindent 12 }}
83+
{{- end }}
7984
{{- end }}
8085
{{- with .Values.memcached.readinessProbe }}
8186
readinessProbe:

0 commit comments

Comments
 (0)