feat(helm): add memcached image registry configuration

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

Author: jkroepke

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

@@ -7708,6 +7708,15 @@ true
 			<td><pre lang="json">
 "IfNotPresent"
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>memcached.image.registry</td>
+			<td>string</td>
+			<td>Memcached Docker image registry</td>
+			<td><pre lang="json">
+""
+</pre>
 </td>
 		</tr>
 		<tr>

production/helm/loki/CHANGELOG.md

@@ -13,6 +13,7 @@ Entries should include a reference to the pull request that introduced the chang
 
 ## Unreleased
 
+- [ENHANCEMENT] add memcached image registry configuration. [#19746](https://github.com/grafana/loki/pull/19746)
 
 ## 6.46.0
 

production/helm/loki/ci/default-single-binary-filesystem-values.yaml

@@ -5,6 +5,11 @@ loki:
   storage:
     type: 'filesystem'
   useTestSchema: true
+  rulerConfig:
+    storage:
+      type: local
+      local:
+        directory: /rules
 deploymentMode: SingleBinary
 singleBinary:
   replicas: 1

production/helm/loki/ci/non-default-values.yaml

@@ -1,3 +1,6 @@
+global:
+  imageRegistry: docker.io
+
 deploymentMode: Distributed
 nameOverride: '{{ $.Release.Name }}'
 test:
@@ -42,6 +45,9 @@ distributor:
 memcached:
   enabled: true
   replicas: 1
+  image:
+    registry: docker.io
+    repository: library/memcached
 compactor:
   replicas: 1
 indexGateway:

production/helm/loki/templates/_helpers.tpl

@@ -165,14 +165,24 @@ Create the name of the service account to use
 Base template for building docker image reference
 */}}
 {{- define "loki.baseImage" }}
+{{- /*
+Determines the final image path for the sidecar, respecting the global registry if defined, unless the local repository
+already contains a full registry (indicated by a dot '.') for backwards-compatibility.
+It also respects `.digest` as well as `.sha` (deprecated).
+This is designed to be a drop-in replacement for `loki.baseImage` as long as backwards compatibility has to be guaranteed i.e. next major release.
+*/ -}}
 {{- $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 -}}
-  {{- printf "%s/%s%s" $registry $repository $ref -}}
-{{- else -}}
-  {{- printf "%s%s%s" $registry $repository $ref -}}
+{{- $sha := and .service.sha (printf "@sha256:%s" .service.sha) | default "" -}}
+{{- $digest := and .service.digest (printf "@%s" .service.digest) | default $sha -}}
+{{- $ref := ternary (printf ":%s" (.service.tag | default .defaultVersion | toString)) ($digest) (empty $digest) -}}
+
+{{- $prefix := "" -}}
+{{- if and $registry $repository (not (contains "." $repository)) -}}
+{{- $prefix = printf "%s/" $registry -}}
 {{- end -}}
+
+{{- printf "%s%s%s" $prefix $repository $ref -}}
 {{- end -}}
 
 {{/*

production/helm/loki/values.yaml

@@ -3480,6 +3480,8 @@ memcached:
   # -- Enable the built in memcached server provided by the chart
   enabled: true
   image:
+    # -- Memcached Docker image registry
+    registry: ""
     # -- Memcached Docker image repository
     repository: memcached
     # -- Memcached Docker image tag