From 009ea5ce21cd0c20713d65e833e18fdbe7e09c9e Mon Sep 17 00:00:00 2001
From: Edward Welch <edward.welch@grafana.com>
Date: Wed, 13 Mar 2024 17:36:16 +0000
Subject: [PATCH] allow adding zone specific ingester annotations

Signed-off-by: Edward Welch <edward.welch@grafana.com>
---
 .../templates/ingester/statefulset-ingester-zone-a.yaml     | 3 +++
 .../templates/ingester/statefulset-ingester-zone-b.yaml     | 3 +++
 .../templates/ingester/statefulset-ingester-zone-c.yaml     | 3 +++
 production/helm/loki/values.yaml                            | 6 ++++++
 4 files changed, 15 insertions(+)

diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml
index bf87757fdfd72..4a11f88196d86 100644
--- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml
+++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml
@@ -16,6 +16,9 @@ metadata:
     {{- with .Values.loki.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+    {{- with .Values.ingester.zoneAwareReplication.zoneA.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
 {{- if not .Values.ingester.autoscaling.enabled }}
   replicas: {{ $replicas }}
diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml
index 91ae934b1eea5..9919124a72878 100644
--- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml
+++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml
@@ -16,6 +16,9 @@ metadata:
     {{- with .Values.loki.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+    {{- with .Values.ingester.zoneAwareReplication.zoneB.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
 {{- if not .Values.ingester.autoscaling.enabled }}
   replicas: {{ $replicas }}
diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml
index bb28936c7b1b2..d0fee75136913 100644
--- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml
+++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml
@@ -16,6 +16,9 @@ metadata:
     {{- with .Values.loki.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+    {{- with .Values.ingester.zoneAwareReplication.zoneC.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
 {{- if not .Values.ingester.autoscaling.enabled }}
   replicas: {{ $replicas }}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index fed28d5db5024..9bc9a960ff418 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -1757,16 +1757,22 @@ ingester:
       nodeSelector: null
       # -- optionally define extra affinity rules, by default different zones are not allowed to schedule on the same host
       extraAffinity: {}
+      # -- Specific annotations to add to zone A
+      annotations: {}
     zoneB:
       # -- optionally define a node selector for this zone
       nodeSelector: null
       # -- optionally define extra affinity rules, by default different zones are not allowed to schedule on the same host
       extraAffinity: {}
+      # -- Specific annotations to add to zone B
+      annotations: {}
     zoneC:
       # -- optionally define a node selector for this zone
       nodeSelector: null
       # -- optionally define extra affinity rules, by default different zones are not allowed to schedule on the same host
       extraAffinity: {}
+      # -- Specific annotations to add to zone C
+      annotations: {}
     # -- The migration block allows migrating non zone aware ingesters to zone aware ingesters.
     migration:
       enabled: false