pr feedback

Author: fbuetler

production/helm/loki/CHANGELOG.md

@@ -13,6 +13,8 @@ Entries should include a reference to the pull request that introduced the chang
 
 ## Unreleased
 
+- [BUGFIX] Respect global registry in sidecar image [#19347](https://github.com/grafana/loki/pull/19347).
+
 ## 6.41.1
 
 - [CHANGE] Changed version of Grafana Loki to 3.5.5.

production/helm/loki/templates/_helpers.tpl

@@ -199,15 +199,17 @@ Determines the final image path for the sidecar, respecting the global registry
 already contains a full registry (indicated by a dot '.') for backwards-compatibility.
 */ -}}
 
-{{- $registry := .Values.global.registry | default .Values.sidecar.image.registry | default "" -}}
-{{- $repo := .Values.sidecar.image.repository -}}
+{{- $image := .Values.sidecar.image }}
+{{- $registry := .Values.global.registry | default $image.registry | default "" -}}
+{{- $repo := $image.repository -}}
+{{- $ref := ternary (printf ":%s" $image.tag) (printf ":%s@sha256:%s" $image.tag $image.sha) (empty $image.sha) -}}
 
 {{- $prefix := "" -}}
 {{- if and $registry (not (contains "." $repo)) -}}
 {{- $prefix = printf "%s/" $registry -}}
 {{- end -}}
 
-{{- printf "%s%s" $prefix $repo -}}
+{{- printf "%s%s%s" $prefix $repo $ref -}}
 {{- end -}}
 
 {{/*

production/helm/loki/templates/backend/statefulset-backend.yaml

@@ -143,11 +143,7 @@ spec:
             {{- toYaml .Values.backend.resources | nindent 12 }}
         {{- if .Values.sidecar.rules.enabled }}
         - name: loki-sc-rules
-          {{- if .Values.sidecar.image.sha }}
-          image: "{{ include "loki.sidecarImage" . }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
-          {{- else }}
-          image: "{{ include "loki.sidecarImage" . }}:{{ .Values.sidecar.image.tag }}"
-          {{- end }}
+          image: "{{ include "loki.sidecarImage" . }}"
           imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
           env:
             - name: METHOD

production/helm/loki/templates/ruler/statefulset-ruler.yaml

@@ -125,11 +125,7 @@ spec:
             {{- toYaml .Values.ruler.resources | nindent 12 }}
         {{- if and .Values.sidecar.rules.enabled .Values.ruler.sidecar }}
         - name: loki-sc-rules
-          {{- if .Values.sidecar.image.sha }}
-          image: "{{ include "loki.sidecarImage" . }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
-          {{- else }}
-          image: "{{ include "loki.sidecarImage" . }}:{{ .Values.sidecar.image.tag }}"
-          {{- end }}
+          image: "{{ include "loki.sidecarImage" . }}"
           imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
           env:
             - name: METHOD

production/helm/loki/templates/single-binary/statefulset.yaml

@@ -150,11 +150,7 @@ spec:
             {{- toYaml .Values.singleBinary.resources | nindent 12 }}
         {{- if .Values.sidecar.rules.enabled }}
         - name: loki-sc-rules
-          {{- if .Values.sidecar.image.sha }}
-          image: "{{ include "loki.sidecarImage" . }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
-          {{- else }}
-          image: "{{ include "loki.sidecarImage" . }}:{{ .Values.sidecar.image.tag }}"
-          {{- end }}
+          image: "{{ include "loki.sidecarImage" . }}"
           imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
           env:
             - name: METHOD