Merge pull request #874 from /pull/871/head

[tempo] Add overrides to Tempo
grafana · Dec 3, 2021 · 9399860 · 9399860
2 parents d69e333 + c0b582c
commit 9399860
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 0.12.0
+version: 0.12.1
 appVersion: 1.2.1
 engine: gotpl
 home: https://grafana.net

diff --git a/charts/tempo/README.md b/charts/tempo/README.md
@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 0.12.0](https://img.shields.io/badge/Version-0.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.1](https://img.shields.io/badge/AppVersion-1.2.1-informational?style=flat-square)
+![Version: 0.12.1](https://img.shields.io/badge/Version-0.12.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.1](https://img.shields.io/badge/AppVersion-1.2.1-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 
@@ -40,6 +40,7 @@ Grafana Tempo Single Binary Mode
 | tempo.extraVolumeMounts | list | `[]` | Volume mounts to add |
 | tempo.ingester | object | `{}` |  |
 | tempo.memBallastSizeMbs | int | `1024` |  |
+| tempo.overrides | object | `{}` |  |
 | tempo.pullPolicy | string | `"IfNotPresent"` |  |
 | tempo.receivers.jaeger.protocols.grpc.endpoint | string | `"0.0.0.0:14250"` |  |
 | tempo.receivers.jaeger.protocols.thrift_binary.endpoint | string | `"0.0.0.0:6832"` |  |

diff --git a/charts/tempo/templates/configmap-tempo.yaml b/charts/tempo/templates/configmap-tempo.yaml
@@ -8,6 +8,7 @@ metadata:
 data:
   overrides.yaml: |
     overrides:
+      {{- toYaml .Values.tempo.overrides | nindent 6 }}
   tempo.yaml: |
     auth_enabled: {{ .Values.tempo.authEnabled }}
     search_enabled: {{ .Values.tempo.searchEnabled }}

diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
@@ -31,6 +31,7 @@ tempo:
   searchEnabled: false
   ingester: {}
   retention: 24h
+  overrides: {}
 
   # Tempo server configuration
   # Refers to https://grafana.com/docs/tempo/latest/configuration/#server