Skip to content

Conversation

portswigger-amason
Copy link

Problem: Component-specific registry overrides weren't working despite being documented as overriding global registry.

Root Cause: Template helper function had incorrect priority order in coalesce:
{{- $registry := coalesce .global.registry .component.registry .tempo.registry -}}

Fix: Changed priority to put component registry first:
`{{- $registry := coalesce .component.registry .tempo.registry .global.registry -}}``

Result:

  • Component registry now properly overrides global registry as documented
  • Fully backwards compatible - when component registry is null, falls back to global
  • Enables clean configuration like memcached.image.registry: public.ecr.aws

@CLAassistant
Copy link

CLAassistant commented Jul 28, 2025

CLA assistant check
All committers have signed the CLA.

@portswigger-amason portswigger-amason changed the title Fixing Tempo Registry Colcase Order [tempo-distributed] Fixing Tempo Registry Colcase Order Jul 28, 2025
@portswigger-amason portswigger-amason force-pushed the fix/tempo-distributed-registry-colcase branch from 74587cb to a27d9d5 Compare July 28, 2025 08:58
@portswigger-amason
Copy link
Author

Could I please get some help in getting this merged. I would like to roll out the changes.

@portswigger-amason
Copy link
Author

@Sheikh-Abubaker Apologies for the ping, could you help me with an approval?

Problem: Component-specific registry overrides weren't working despite being documented as overriding global registry.

  Root Cause: Template helper function had incorrect priority order in coalesce:
  `{{- $registry := coalesce .global.registry .component.registry .tempo.registry -}}`

  Fix: Changed priority to put component registry first:
  `{{- $registry := coalesce .component.registry .tempo.registry .global.registry -}}``

  Result:
  - Component registry now properly overrides global registry as documented
  - Fully backwards compatible - when component registry is null, falls back to global
  - Enables clean configuration like memcached.image.registry: public.ecr.aws

Signed-off-by: portswigger-amason <[email protected]>
Signed-off-by: portswigger-amason <[email protected]>
@portswigger-amason portswigger-amason force-pushed the fix/tempo-distributed-registry-colcase branch from c1a67fb to 80c6f5c Compare July 29, 2025 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants