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

puretension · 2025-09-21T18:52:34Z

What this PR does / why we need it:

This PR standardizes the global image registry configuration to match other Grafana charts by supporting the standard global.imageRegistry format while maintaining backwards compatibility with the existing global.image.registry format.

Currently, Loki chart uses a different structure for global image registry override compared to other Grafana charts:

Loki (current): global.image.registry
Other Grafana charts (standard): global.imageRegistry

This inconsistency forces users to configure different charts differently, contradicting the purpose of having a global override.

Which issue(s) this PR fixes:
Fixes #16511
Fixes #19212

Special notes for your reviewer:

This change maintains full backwards compatibility - existing configurations using global.image.registry will continue to work. The precedence order is: global.imageRegistry > global.image.registry > global.registry > service.registry.

The existing global.image.registry is marked as deprecated in documentation to encourage migration to the standard format.

Checklist

Reviewed the CONTRIBUTING.md guide (required)
Documentation added (updated values.yaml comments)
Tests updated (not applicable - template logic change)
Title matches the required conventional commits format, see here
Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md (not required - backwards compatible)
If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively (not applicable - no removal, only deprecation notice in comments)

Changes Made

Updated _helpers.tpl: Modified loki.baseImage template to support standard global.imageRegistry
Updated values.yaml: Added global.imageRegistry with proper documentation and marked existing format as deprecated
Maintained compatibility: All existing configurations continue to work

Before/After

Before:

global:
 image:
   registry: my-registry.com  # Only way to set global registry

After (both work, standard recommended):

# New standard format (recommended)
global:
 imageRegistry: my-registry.com

JStickler · 2025-09-23T13:50:09Z

production/helm/loki/Chart.yaml

 type: application
 appVersion: 3.5.3
-version: 6.40.0
+version: 6.40.1


You don't need to update the version number, this is handled automatically as part of the automation. See here for an example.

@JStickler Thank you for pointing that out! I understand now that chart version updates are handled automatically by the release automation. I've reverted the version change from 6.40.1 back to 6.40.0.

Thanks to your guidance, I now have a better understanding of the project's workflow and won't repeat these mistakes. Thank you for your patience! 🫡

Fixes grafana#19212 This PR standardizes the global image registry configuration to match other Grafana charts by supporting the standard global.imageRegistry format while maintaining backwards compatibility. Changes: - Add support for standard global.imageRegistry in _helpers.tpl - Add global.imageRegistry to values.yaml with proper documentation - Maintain backwards compatibility with existing global.image.registry - Update precedence order: global.imageRegistry > global.image.registry > global.registry Users can now use the standard format across all Grafana charts: global: imageRegistry: my-registry.com While existing configurations continue to work: global: image: registry: my-registry.com Signed-off-by: puretension <[email protected]>

jkroepke

Make sense, since grafana helm follow the same

https://github.com/grafana/helm-charts/blob/24bcd88fe72d0a683583fffa96867804ec02b98d/charts/grafana/values.yaml#L1-L3

jkroepke · 2025-09-27T14:21:21Z

production/helm/loki/templates/_helpers.tpl

 */}}
 {{- define "loki.baseImage" }}
-{{- $registry := .global.registry | default .service.registry | default "" -}}
+{{- $registry := .global.imageRegistry | default ((.global.image).registry) | default .global.registry | default .service.registry | default "" -}}


What about non loki image, e.g nginx and memcache?

@jkroepke Thank you for catching this critical issue! You're absolutely right and this was the hidden root cause I missed.

While I updated the loki.baseImage helper to support global.imageRegistry, I only applied it to the main Loki image. The nginx, memcached, memcachedExporter, and sidecar images were still using direct
{{ .repository }}:{{ .tag }} format, completely bypassing the global registry logic.

I've now extended the fix to ensure all images consistently use the loki.baseImage helper:

Memcached & MemcachedExporter images

Sidecar images (single-binary, backend, ruler deployments)

Gateway (nginx) was already using loki.gatewayImage → loki.baseImage

This ensures true global registry standardization across the entire chart, matching the Grafana helm pattern you referenced.

Example usage:

yaml global: imageRegistry: my-registry.com

Great catch on the incomplete implementation! 🙏

- Extended global.imageRegistry support to memcached, memcachedExporter, and sidecar images - All images now consistently use loki.baseImage helper for global registry override - Ensures complete standardization across the entire chart Addresses reviewer feedback on incomplete image coverage. Signed-off-by: puretension <[email protected]>

jkroepke · 2025-10-17T20:23:31Z

@puretension could you add an Fixes #16511 as well on the first post?

jkroepke · 2025-10-17T20:24:01Z

@puretension Still missing a CHANGELOG entry. Please add one.

…tion Add CHANGELOG entry for PR grafana#19246 that standardizes global image registry configuration to match other Grafana charts. Signed-off-by: puretension <[email protected]>

puretension · 2025-10-18T05:17:27Z

@jkroepke Both requests have been addressed!
I've added Fixes #16511 to the PR description so both issues will be automatically closed when merged,
and I've also added the CHANGELOG entry under the Unreleased section following the project's format.
Please let me know if there's anything else I missed. Thanks for the guidance! 🙏

jkroepke · 2025-10-18T08:18:56Z

This should be merged before #19347 gets merged.

LGTM

Jayclifford345

LGTM

Since grafana#19246 the sidecar image would resolve to registry-mirror.example.com/docker.io/kiwigrid/k8s-sidecar when a global registry mirror was defined. Signed-off-by: Sefa Eyeoglu <[email protected]>

LukoJy3D · 2025-11-07T08:14:30Z

This introduced some problems mentioned in #19662

puretension requested a review from a team as a code owner September 21, 2025 18:52

pull-request-size bot added the size/XS label Sep 21, 2025

JStickler reviewed Sep 23, 2025

View reviewed changes

JStickler changed the title ~~fix: standardize global image registry to match other Grafana charts~~ fix(helm): standardize global image registry to match other Grafana charts Sep 23, 2025

puretension force-pushed the fix/standardize-global-image-registry-19212 branch from 5a80da6 to 89595ea Compare September 23, 2025 13:59

pull-request-size bot added size/S and removed size/XS labels Sep 23, 2025

jkroepke reviewed Sep 27, 2025

View reviewed changes

pull-request-size bot added size/M and removed size/S labels Sep 27, 2025

jkroepke mentioned this pull request Oct 7, 2025

fix(helm): Respect global registry in sidecar image (#18246) #19347

Merged

3 tasks

Merge branch 'main' into fix/standardize-global-image-registry-19212

55bb0d9

jkroepke mentioned this pull request Oct 17, 2025

feat(helm): add image registry value for memcached and memcached-exporter #16511

Closed

6 tasks

docs(helm): add CHANGELOG entry for global image registry standardiza…

4e27c45

…tion Add CHANGELOG entry for PR grafana#19246 that standardizes global image registry configuration to match other Grafana charts. Signed-off-by: puretension <[email protected]>

Jayclifford345 approved these changes Oct 28, 2025

View reviewed changes

Jayclifford345 merged commit 91e11fc into grafana:main Oct 28, 2025
79 checks passed

Scrumplex mentioned this pull request Oct 31, 2025

fix(helm): support global registry override for sidecar #19658

Closed

6 tasks

Scrumplex mentioned this pull request Oct 31, 2025

fix(helm): support global registry override for sidecar #19671

Open

6 tasks

ostrain mentioned this pull request Nov 5, 2025

Proposal - Loki - Change global.image.registry to global.imageRegistry for compatability with other Helm charts #12202

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

puretension commented Sep 21, 2025 •

edited

Loading

Uh oh!

JStickler Sep 23, 2025

Uh oh!

puretension Sep 23, 2025 •

edited

Loading

Uh oh!

jkroepke left a comment

Uh oh!

jkroepke Sep 27, 2025

Uh oh!

puretension Sep 27, 2025

Uh oh!

jkroepke commented Oct 17, 2025

Uh oh!

jkroepke commented Oct 17, 2025

Uh oh!

puretension commented Oct 18, 2025

Uh oh!

jkroepke commented Oct 18, 2025

Uh oh!

Jayclifford345 left a comment

Uh oh!

Uh oh!

LukoJy3D commented Nov 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

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

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

Uh oh!

Conversation

puretension commented Sep 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

Before/After

Uh oh!

JStickler Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

puretension Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jkroepke left a comment

Choose a reason for hiding this comment

Uh oh!

jkroepke Sep 27, 2025

Choose a reason for hiding this comment

Uh oh!

puretension Sep 27, 2025

Choose a reason for hiding this comment

Uh oh!

jkroepke commented Oct 17, 2025

Uh oh!

jkroepke commented Oct 17, 2025

Uh oh!

puretension commented Oct 18, 2025

Uh oh!

jkroepke commented Oct 18, 2025

Uh oh!

Jayclifford345 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

LukoJy3D commented Nov 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

puretension commented Sep 21, 2025 •

edited

Loading

puretension Sep 23, 2025 •

edited

Loading