Merge pull request #3981 from sringel/bugfix-zone-annotations

[tempo-distributed] bugfix: ingester zone specific statefulset and pod annotations

Author: Sheikh-Abubaker

charts/tempo-distributed/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.52.6
+version: 1.52.7
 appVersion: 2.9.0
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/

charts/tempo-distributed/README.md

@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.52.6](https://img.shields.io/badge/Version-1.52.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
+![Version: 1.52.7](https://img.shields.io/badge/Version-1.52.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.0](https://img.shields.io/badge/AppVersion-2.9.0-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 

charts/tempo-distributed/templates/ingester/_helpers-ingester.tpl

@@ -4,7 +4,7 @@
 {{- end }}
 {{- define "ingester.zoneAwareReplicationMap" -}}
 {{- $zonesMap := (dict) -}}
-{{- $defaultZone := (dict "affinity" .ctx.Values.ingester.affinity "nodeSelector" .ctx.Values.ingester.nodeSelector "replicas" .ctx.Values.ingester.replicas "storageClass" .ctx.Values.ingester.storageClass) -}}
+{{- $defaultZone := (dict "affinity" .ctx.Values.ingester.affinity "annotations" (default (dict)) "nodeSelector" .ctx.Values.ingester.nodeSelector "podAnnotations" (default (dict)) "replicas" .ctx.Values.ingester.replicas "storageClass" .ctx.Values.ingester.storageClass) -}}
 {{- if .ctx.Values.ingester.zoneAwareReplication.enabled -}}
 {{- $numberOfZones := len .ctx.Values.ingester.zoneAwareReplication.zones -}}
 {{- if lt $numberOfZones 3 -}}
@@ -16,7 +16,7 @@
 {{- $extraAffinity := $rolloutZone.extraAffinity | default (dict) -}}
 {{- $zoneAntiAffinity := include "ingester.zoneAntiAffinity" (dict "rolloutZoneName" $rolloutZone.name "topologyKey" $.ctx.Values.ingester.zoneAwareReplication.topologyKey) | fromYaml -}}
 {{- $mergedAffinity := mergeOverwrite $extraAffinity $zoneAntiAffinity -}}
-{{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" $mergedAffinity "nodeSelector" ($rolloutZone.nodeSelector | default (dict)) "replicas" $replicaPerZone  "storageClass" $rolloutZone.storageClass) -}}
+{{- $_ := set $zonesMap $rolloutZone.name (dict "affinity" $mergedAffinity "annotations" ($rolloutZone.annotations | default (dict)) "nodeSelector" ($rolloutZone.nodeSelector | default (dict)) "podAnnotations" ($rolloutZone.podAnnotations | default (dict)) "replicas" $replicaPerZone  "storageClass" $rolloutZone.storageClass) -}}
 {{- end -}}
 {{- else -}}
 {{- $_ := set $zonesMap "" $defaultZone -}}

charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml

@@ -15,7 +15,7 @@ metadata:
   {{- if .Values.ingester.zoneAwareReplication.enabled }}
   annotations:
     {{- include "ingester.Annotations" $dict | nindent 4}}
-    {{- with $rolloutZone.annotations }}:
+    {{- with $rolloutZone.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- else }}
@@ -54,7 +54,7 @@ spec:
         {{- with .Values.ingester.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with $rolloutZone.podAnnotations }}:
+        {{- with $rolloutZone.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec: