Skip to content

[jaeger] Add support for podAnnotations to all-in-one deployment #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
m-dot-jung wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[jaeger] Add support for podAnnotations to all-in-one deployment #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/jaeger/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
version: 2.34.0
digest: sha256:63de10c1f68bedef391890484e1e29f2efd54e6dc7239ca60f0a572042efd4f3
generated: "2026-02-03T13:47:26.844621Z"
version: 2.36.0
digest: sha256:a9e48d71c1ab826e89a4115379550999c1787634d834acfe22122560393685b4
generated: "2026-02-11T16:40:36.0392565+01:00"
2 changes: 1 addition & 1 deletion charts/jaeger/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 2.14.1
description: A Jaeger Helm chart for Kubernetes
name: jaeger
type: application
version: 4.4.7
version: 4.4.8
# Artifact Hub annotations
# The jaeger image is whitelisted from security scanning because the reported
# CVEs are in the upstream Alpine base image (OpenSSL libcrypto3/libssl3) and
Expand Down
3 changes: 3 additions & 0 deletions charts/jaeger/templates/jaeger/jaeger-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ spec:
annotations:
prometheus.io/port: "8888"
prometheus.io/scrape: "true"
{{- if .Values.jaeger.podAnnotations }}
{{- toYaml .Values.jaeger.podAnnotations | nindent 8 }}
{{- end }}
Comment on lines 34 to +38
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Appending podAnnotations directly under annotations: can lead to duplicate YAML keys if a user sets something like prometheus.io/scrape in jaeger.podAnnotations, which can be rejected by some YAML parsers or behave inconsistently. Consider building a single annotations map (e.g., start with the hardcoded Prometheus annotations, merge in jaeger.podAnnotations with a defined precedence), then render it once to avoid duplicates.

Suggested change
prometheus.io/port: "8888"
prometheus.io/scrape: "true"
{{- if .Values.jaeger.podAnnotations }}
{{- toYaml .Values.jaeger.podAnnotations | nindent 8 }}
{{- end }}
{{- $podAnnotations := dict "prometheus.io/port" "8888" "prometheus.io/scrape" "true" -}}
{{- if .Values.jaeger.podAnnotations }}
{{- $podAnnotations = merge $podAnnotations .Values.jaeger.podAnnotations -}}
{{- end }}
{{- toYaml $podAnnotations | nindent 8 }}

Copilot uses AI. Check for mistakes.
spec:
{{- include "jaeger.imagePullSecrets" . | nindent 6 }}
containers:
Expand Down
1 change: 1 addition & 0 deletions charts/jaeger/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ jaeger:
tolerations: []
affinity: {}
topologySpreadContraints: []
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

topologySpreadContraints is misspelled in values.yaml, but the templates reference .Values.jaeger.topologySpreadConstraints (with an extra “s”). As-is, user-provided values under this key won’t be picked up by the deployment. Rename the values key to topologySpreadConstraints (keeping a backwards-compat alias if you need to avoid a breaking change).

Suggested change
topologySpreadContraints: []
topologySpreadConstraints: []

Copilot uses AI. Check for mistakes.
podAnnotations: {}
podSecurityContext:
runAsUser: 10001
runAsGroup: 10001
Expand Down