Helm: commonLabels is not available in podLabel, improved code (grafa…

…na#9067) Signed-off-by: fabio trigari <[email protected]>
ftrigari · Oct 26, 2024 · a18ccc2 · a18ccc2
1 parent 316f1bb
commit a18ccc2
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/operations/helm/charts/mimir-distributed/templates/_helpers.tpl b/operations/helm/charts/mimir-distributed/templates/_helpers.tpl
@@ -208,8 +208,8 @@ Params:
   ctx = . context
 */}}
 {{- define "mimir.commonLabels" -}}
-{{- if .ctx.Values.global.commonLabels }}
-{{- toYaml .ctx.Values.global.commonLabels  }}
+{{- with .ctx.Values.global.commonLabels }}
+{{- toYaml .  }}
 {{- end }}
 {{- end -}}
 
@@ -255,7 +255,7 @@ name: "{{ .component }}-{{ .rolloutZoneName }}" {{- /* Currently required for ro
 rollout-group: {{ .component }}
 zone: {{ .rolloutZoneName }}
 {{- end }}
-{{ include "mimir.commonLabels" (dict "ctx" .ctx ) }}
+{{ include "mimir.commonLabels" . }}
 {{- end -}}
 
 {{/*
@@ -309,7 +309,6 @@ name: "{{ .component }}-{{ .rolloutZoneName }}" {{- /* Currently required for ro
 rollout-group: {{ .component }}
 zone: {{ .rolloutZoneName }}
 {{- end }}
-{{ include "mimir.commonLabels" (dict "ctx" .ctx )  }}
 {{- end -}}
 
 {{/*