Skip to content

[jaeger] Fix nil pointer in user and UI config map annotations - #783

Open
berlewis wants to merge 1 commit into
jaegertracing:mainfrom
berlewis:fix/jaeger-config-annotations
Open

berlewis wants to merge 1 commit into
jaegertracing:mainfrom
berlewis:fix/jaeger-config-annotations

Conversation

@berlewis

Copy link
Copy Markdown

What this PR does

jaeger-user-config.yaml and jaeger-ui-config.yaml passed the root context to jaeger.annotations, which expects a dict, so setting commonAnnotations with userconfig or uiconfig failed with a nil pointer. Both now call the helper like the other templates, as proposed by @paripooranan in the issue. I also added uiconfig to the common labels/annotations CI values so the UI config map path is rendered and installed in CI (userconfig replaces the whole config, so it stays out of CI).

Tested with the repro from the issue (fails on main, renders here) and on a kind cluster with commonAnnotations, userconfig and uiconfig; the default render is unchanged.

Which issue this PR fixes

Checklist

  • DCO signed
  • Commits are GPG signed
  • Chart Version bumped
  • Title of the PR starts with chart name ([jaeger] or [jaeger-operator])
  • README.md has been updated to match version/contain new values (no new values)

Written with AI assistance, reviewed and tested by me.

jaeger-user-config.yaml and jaeger-ui-config.yaml passed the root
context to the jaeger.annotations helper, which expects a dict with
context and component keys. Setting commonAnnotations together with
userconfig or uiconfig made helm template fail with a nil pointer.
Call the helper like the other templates do, and cover the UI config
map in the common labels/annotations CI values.

Signed-off-by: Lewis Bertin <lewis@tactiqual.tech>

This branch has not been deployed

No deployments
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.

[Bug]: jaeger.annotations called incorrectly in jaeger-user-config.yaml

1 participant