Set ingester availability_zone based on $zoneName when ingester.zoneA…

…wareReplication is enabled. Signed-off-by: sringel <[email protected]>
grafana · Aug 7, 2024 · 0ea930d · 0ea930d
1 parent 55304fd
commit 0ea930d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git 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
@@ -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: