fix(helm): standardize global image registry to match other Grafana charts (#19246)

Signed-off-by: puretension <[email protected]>

Author: puretension

docs/sources/setup/install/helm/reference.md

@@ -5402,7 +5402,16 @@ true
 		<tr>
 			<td>global.image.registry</td>
 			<td>string</td>
-			<td>Overrides the Docker registry globally for all images</td>
+			<td>Overrides the Docker registry globally for all images (deprecated, use global.imageRegistry)</td>
+			<td><pre lang="json">
+null
+</pre>
+</td>
+		</tr>
+		<tr>
+			<td>global.imageRegistry</td>
+			<td>string</td>
+			<td>Overrides the Docker registry globally for all images (standard format)</td>
 			<td><pre lang="json">
 null
 </pre>

production/helm/loki/CHANGELOG.md

@@ -50,6 +50,7 @@ Before upgrading to this version, make sure that the CustomResourceDefinitions (
 
 - [BUGFIX] Explicitly set registry for k8s-sidecar image [#19233](<https://github.com/grafana/loki/pull/19233>]
 - [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for the nginx container in the gateway pods. [#18545](https://github.com/grafana/loki/pull/18545)
+- [ENHANCEMENT] Standardize global image registry configuration to match other Grafana charts [#19246](https://github.com/grafana/loki/pull/19246)
 
 ## 6.40.0
 

production/helm/loki/templates/_helpers.tpl

@@ -160,7 +160,7 @@ Create the name of the service account to use
 Base template for building docker image reference
 */}}
 {{- define "loki.baseImage" }}
-{{- $registry := .global.registry | default .service.registry | default "" -}}
+{{- $registry := .global.imageRegistry | default ((.global.image).registry) | default .global.registry | default .service.registry | default "" -}}
 {{- $repository := .service.repository | default "" -}}
 {{- $ref := ternary (printf ":%s" (.service.tag | default .defaultVersion | toString)) (printf "@%s" .service.digest) (empty .service.digest) -}}
 {{- if and $registry $repository -}}

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

@@ -143,10 +143,11 @@ spec:
             {{- toYaml .Values.backend.resources | nindent 12 }}
         {{- if .Values.sidecar.rules.enabled }}
         - name: loki-sc-rules
+          {{- $dict := dict "service" .Values.sidecar.image "global" .Values.global }}
           {{- if .Values.sidecar.image.sha }}
-          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
+          image: "{{ include "loki.baseImage" $dict }}@sha256:{{ .Values.sidecar.image.sha }}"
           {{- else }}
-          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
+          image: {{ include "loki.baseImage" $dict }}
           {{- end }}
           imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
           env:

production/helm/loki/templates/memcached/_memcached-statefulset.tpl

@@ -89,10 +89,9 @@ spec:
         {{ toYaml .extraContainers | nindent 8 }}
         {{- end }}
         - name: memcached
-          {{- with $.ctx.Values.memcached.image }}
-          image: {{ .repository }}:{{ .tag }}
-          imagePullPolicy: {{ .pullPolicy }}
-          {{- end }}
+          {{- $dict := dict "service" $.ctx.Values.memcached.image "global" $.ctx.Values.global }}
+          image: {{ include "loki.baseImage" $dict }}
+          imagePullPolicy: {{ $.ctx.Values.memcached.image.pullPolicy }}
           resources:
           {{- if .resources }}
             {{- toYaml .resources | nindent 12 }}
@@ -155,10 +154,9 @@ spec:
 
       {{- if $.ctx.Values.memcachedExporter.enabled }}
         - name: exporter
-          {{- with $.ctx.Values.memcachedExporter.image }}
-          image: {{ .repository}}:{{ .tag }}
-          imagePullPolicy: {{ .pullPolicy }}
-          {{- end }}
+          {{- $dict := dict "service" $.ctx.Values.memcachedExporter.image "global" $.ctx.Values.global }}
+          image: {{ include "loki.baseImage" $dict }}
+          imagePullPolicy: {{ $.ctx.Values.memcachedExporter.image.pullPolicy }}
           ports:
             - containerPort: 9150
               name: http-metrics

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

@@ -125,10 +125,11 @@ spec:
             {{- toYaml .Values.ruler.resources | nindent 12 }}
         {{- if and .Values.sidecar.rules.enabled .Values.ruler.sidecar }}
         - name: loki-sc-rules
+          {{- $dict := dict "service" .Values.sidecar.image "global" .Values.global }}
           {{- if .Values.sidecar.image.sha }}
-          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
+          image: "{{ include "loki.baseImage" $dict }}@sha256:{{ .Values.sidecar.image.sha }}"
           {{- else }}
-          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
+          image: {{ include "loki.baseImage" $dict }}
           {{- end }}
           imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
           env:

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

@@ -153,10 +153,11 @@ spec:
             {{- toYaml .Values.singleBinary.resources | nindent 12 }}
         {{- if .Values.sidecar.rules.enabled }}
         - name: loki-sc-rules
+          {{- $dict := dict "service" .Values.sidecar.image "global" .Values.global }}
           {{- if .Values.sidecar.image.sha }}
-          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
+          image: "{{ include "loki.baseImage" $dict }}@sha256:{{ .Values.sidecar.image.sha }}"
           {{- else }}
-          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
+          image: {{ include "loki.baseImage" $dict }}
           {{- end }}
           imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
           env:

production/helm/loki/values.yaml

@@ -5,8 +5,10 @@
 kubeVersionOverride: null
 
 global:
+  # -- Overrides the Docker registry globally for all images (standard format)
+  imageRegistry: null
   image:
-    # -- Overrides the Docker registry globally for all images
+    # -- Overrides the Docker registry globally for all images (deprecated, use global.imageRegistry)
     registry: null
   # -- Overrides the priorityClassName for all pods
   priorityClassName: null