Skip to content

Commit 58822fd

Browse files
fix(tempo-distributed): order of the registry and pullSecrets to be injected
Signed-off-by: Julien Delavande <juliendelavande@gmail.com>
1 parent 3a633bf commit 58822fd

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

charts/tempo-distributed/templates/_helpers.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ If release name contains chart name it will be used as a full name.
2828
Docker image selector for Tempo. Hierachy based on global, component, and tempo values.
2929
*/}}
3030
{{- define "tempo.tempoImage" -}}
31-
{{- $registry := coalesce .global.registry .component.registry .tempo.registry -}}
31+
{{- $registry := coalesce .component.registry .tempo.registry .global.registry -}}
3232
{{- $repository := coalesce .component.repository .tempo.repository -}}
3333
{{- $tag := coalesce .component.tag .tempo.tag .defaultVersion | toString -}}
3434
{{- printf "%s/%s:%s" $registry $repository $tag -}}
@@ -38,7 +38,7 @@ Docker image selector for Tempo. Hierachy based on global, component, and tempo
3838
Optional list of imagePullSecrets for Tempo docker images
3939
*/}}
4040
{{- define "tempo.imagePullSecrets" -}}
41-
{{- $imagePullSecrets := coalesce .global.pullSecrets .component.pullSecrets .tempo.pullSecrets -}}
41+
{{- $imagePullSecrets := coalesce .component.pullSecrets .tempo.pullSecrets .global.pullSecrets -}}
4242
{{- if $imagePullSecrets -}}
4343
imagePullSecrets:
4444
{{- range $imagePullSecrets }}

0 commit comments

Comments
 (0)