diff --git a/charts/tempo-distributed/templates/_helpers.tpl b/charts/tempo-distributed/templates/_helpers.tpl index 1167893746..acb42647c9 100644 --- a/charts/tempo-distributed/templates/_helpers.tpl +++ b/charts/tempo-distributed/templates/_helpers.tpl @@ -28,7 +28,7 @@ If release name contains chart name it will be used as a full name. Docker image selector for Tempo. Hierachy based on global, component, and tempo values. */}} {{- define "tempo.tempoImage" -}} -{{- $registry := coalesce .global.registry .component.registry .tempo.registry -}} +{{- $registry := coalesce .component.registry .tempo.registry .global.registry -}} {{- $repository := coalesce .component.repository .tempo.repository -}} {{- $tag := coalesce .component.tag .tempo.tag .defaultVersion | toString -}} {{- printf "%s/%s:%s" $registry $repository $tag -}} @@ -38,7 +38,7 @@ Docker image selector for Tempo. Hierachy based on global, component, and tempo Optional list of imagePullSecrets for Tempo docker images */}} {{- define "tempo.imagePullSecrets" -}} -{{- $imagePullSecrets := coalesce .global.pullSecrets .component.pullSecrets .tempo.pullSecrets -}} +{{- $imagePullSecrets := coalesce .component.pullSecrets .tempo.pullSecrets .global.pullSecrets -}} {{- if $imagePullSecrets -}} imagePullSecrets: {{- range $imagePullSecrets }}