diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml index 0f4831560a..76489e257a 100644 --- a/charts/tempo-distributed/Chart.yaml +++ b/charts/tempo-distributed/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: tempo-distributed description: Grafana Tempo in MicroService mode type: application -version: 1.42.1 +version: 1.42.2 appVersion: 2.8.0 engine: gotpl home: https://grafana.com/docs/tempo/latest/ diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md index 1dfcb54a27..c24cdb4ac4 100755 --- a/charts/tempo-distributed/README.md +++ b/charts/tempo-distributed/README.md @@ -1,6 +1,6 @@ # tempo-distributed -![Version: 1.42.1](https://img.shields.io/badge/Version-1.42.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square) +![Version: 1.42.2](https://img.shields.io/badge/Version-1.42.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.0](https://img.shields.io/badge/AppVersion-2.8.0-informational?style=flat-square) Grafana Tempo in MicroService mode @@ -579,6 +579,7 @@ The memcached default args are removed and should be provided manually. The sett | ingester.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the ingester pods | | ingester.extraVolumeMounts | list | `[]` | Extra volumes for ingester pods | | ingester.extraVolumes | list | `[]` | Extra volumes for ingester deployment | +| ingester.extraContainers | list | `[]` | Extra containers for ingester deployment | | ingester.hostAliases | list | `[]` | hostAliases to add | | ingester.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | ingester.image.registry | string | `nil` | The Docker registry for the ingester image. Overrides `tempo.image.registry` | @@ -821,6 +822,7 @@ The memcached default args are removed and should be provided manually. The sett | querier.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the querier pods | | querier.extraVolumeMounts | list | `[]` | Extra volumes for querier pods | | querier.extraVolumes | list | `[]` | Extra volumes for querier deployment | +| querier.extraContainers | list | `[]` | Extra containers for querier deployment | | querier.hostAliases | list | `[]` | hostAliases to add | | querier.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | querier.image.registry | string | `nil` | The Docker registry for the querier image. Overrides `tempo.image.registry` | @@ -869,6 +871,7 @@ The memcached default args are removed and should be provided manually. The sett | queryFrontend.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the query-frontend pods | | queryFrontend.extraVolumeMounts | list | `[]` | Extra volumes for query-frontend pods | | queryFrontend.extraVolumes | list | `[]` | Extra volumes for query-frontend deployment | +| queryFrontend.extraContainers | list | `[]` | Extra containers for query-frontend deployment | | queryFrontend.hostAliases | list | `[]` | hostAliases to add | | queryFrontend.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` | | queryFrontend.image.registry | string | `nil` | The Docker registry for the query-frontend image. Overrides `tempo.image.registry` | diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml index 3d6ffa9e30..cb2660fab3 100644 --- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml +++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml @@ -164,6 +164,9 @@ spec: {{- with .Values.ingester.extraVolumes }} {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.ingester.extraContainers }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- if not .Values.ingester.persistence.enabled }} - name: data emptyDir: {} diff --git a/charts/tempo-distributed/templates/querier/deployment-querier.yaml b/charts/tempo-distributed/templates/querier/deployment-querier.yaml index 220fb99a9f..ba56aab302 100644 --- a/charts/tempo-distributed/templates/querier/deployment-querier.yaml +++ b/charts/tempo-distributed/templates/querier/deployment-querier.yaml @@ -112,6 +112,9 @@ spec: {{- with .Values.querier.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.querier.extraContainers }} + {{- toYaml . | nindent 12 }} + {{- end }} terminationGracePeriodSeconds: {{ .Values.querier.terminationGracePeriodSeconds }} {{- if semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version }} {{- with .Values.querier.topologySpreadConstraints }} diff --git a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml index cc4234c332..c8b941af46 100644 --- a/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml +++ b/charts/tempo-distributed/templates/query-frontend/deployment-query-frontend.yaml @@ -107,6 +107,9 @@ spec: {{- with .Values.queryFrontend.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + {{- with .Values.queryFrontend.extraContainers }} + {{- toYaml . | nindent 12 }} + {{- end }} {{- if .Values.queryFrontend.query.enabled }} - args: - -config=/conf/tempo.yaml