allow adding per zone pod annotations.

Signed-off-by: Edward Welch <edward.welch@grafana.com>
grafana · Mar 14, 2024 · 723e729 · 723e729
1 parent c49af92
commit 723e729
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 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
@@ -52,6 +52,9 @@ spec:
         {{- with .Values.ingester.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.ingester.zoneAwareReplication.zoneA.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "loki.ingesterSelectorLabels" . | nindent 8 }}
         app.kubernetes.io/part-of: memberlist

diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml
@@ -52,6 +52,9 @@ spec:
         {{- with .Values.ingester.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.ingester.zoneAwareReplication.zoneB.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "loki.ingesterSelectorLabels" . | nindent 8 }}
         app.kubernetes.io/part-of: memberlist

diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml
@@ -52,6 +52,9 @@ spec:
         {{- with .Values.ingester.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.ingester.zoneAwareReplication.zoneC.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "loki.ingesterSelectorLabels" . | nindent 8 }}
         app.kubernetes.io/part-of: memberlist

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -1757,22 +1757,28 @@ 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
+      # -- Specific annotations to add to zone A statefulset
       annotations: {}
+      # -- Specific annotations to add to zone A pods
+      podAnnotations: {}
     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
+      # -- Specific annotations to add to zone B statefulset
       annotations: {}
+      # -- Specific annotations to add to zone B pods
+      podAnnotations: {}
     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
+      # -- Specific annotations to add to zone C statefulset
       annotations: {}
+      # -- Specific annotations to add to zone C pods
+      podAnnotations: {}
     # -- The migration block allows migrating non zone aware ingesters to zone aware ingesters.
     migration:
       enabled: false