From 31e22d3d1dfe53c6f596864f61c8fcf0a35c72c1 Mon Sep 17 00:00:00 2001
From: sringel <903498+sringel@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:56:04 -0500
Subject: [PATCH 1/3] Set ingester availability_zone based on  $zoneName when
 ingester.zoneAwareReplication is enabled.

Signed-off-by: sringel <903498+sringel@users.noreply.github.com>
---
 .../templates/ingester/statefulset-ingester.yaml    | 13 +++++++++++++
 charts/tempo-distributed/values.yaml                |  1 +
 2 files changed, 14 insertions(+)

diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
index debe777b64..e55e37c482 100644
--- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
@@ -73,6 +73,9 @@ spec:
       containers:
         - args:
             - -target=ingester
+            {{- if .Values.ingester.zoneAwareReplication.enabled }}
+            - -config.expand-env=true
+            {{- end }}
             - -config.file=/conf/tempo.yaml
             - -mem-ballast-size-mbs=1024
             {{- with .Values.ingester.extraArgs }}
@@ -88,10 +91,20 @@ spec:
               containerPort: {{ include "tempo.memberlistBindPort" . }}
             - name: http-metrics
               containerPort: 3100
+          {{- if .Values.ingester.zoneAwareReplication.enabled }}
+          env:
+            - name: AVAILABILITY_ZONE
+              value: {{ $zoneName }}
+          {{- end }}
+          {{- with .Values.ingester.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- else }}
           {{- with .Values.ingester.extraEnv }}
           env:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- end }}
           {{- with .Values.ingester.extraEnvFrom }}
           envFrom:
             {{- toYaml . | nindent 12 }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index cb546e1ca4..135aa436f8 100755
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -1332,6 +1332,7 @@ config: |
       ring:
         replication_factor: {{ .Values.ingester.config.replication_factor }}
         {{- if .Values.ingester.zoneAwareReplication.enabled }}
+        availability_zone: ${AVAILABILITY_ZONE}
         zone_awareness_enabled: true
         {{- end }}
         kvstore:

From f57ae1cd3244fee915e758d1ad9ed981e50eb458 Mon Sep 17 00:00:00 2001
From: sringel <903498+sringel@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:25:30 -0500
Subject: [PATCH 2/3] removed extra end

Signed-off-by: sringel <903498+sringel@users.noreply.github.com>
---
 .../templates/ingester/statefulset-ingester.yaml                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
index e55e37c482..b0c0af8c05 100644
--- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
@@ -95,7 +95,6 @@ spec:
           env:
             - name: AVAILABILITY_ZONE
               value: {{ $zoneName }}
-          {{- end }}
           {{- with .Values.ingester.extraEnv }}
             {{- toYaml . | nindent 12 }}
           {{- end }}

From bdef087d0d2e47fd65afdc42a4e59eb42df33207 Mon Sep 17 00:00:00 2001
From: sringel <903498+sringel@users.noreply.github.com>
Date: Sun, 11 Aug 2024 10:39:05 -0500
Subject: [PATCH 3/3] bump chart version

Signed-off-by: sringel <903498+sringel@users.noreply.github.com>
---
 charts/tempo-distributed/Chart.yaml | 2 +-
 charts/tempo-distributed/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 498e9fa22d..848f4d3bc2 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.16.2
+version: 1.16.3
 appVersion: 2.5.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 824a7b286c..53a4fb2db6 100755
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.16.2](https://img.shields.io/badge/Version-1.16.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
+![Version: 1.16.3](https://img.shields.io/badge/Version-1.16.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode