allow adding zone specific ingester annotations

Signed-off-by: Edward Welch <[email protected]>
grafana · Mar 13, 2024 · 009ea5c · 009ea5c
1 parent b2bc096
commit 009ea5c
Show file tree

Hide file tree

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