Skip to content

Commit f8149de

Browse files
authored
[jaeger] Add support for podAnnotations to all-in-one deployment (#739)
## Summary Currently, the `all-in-one` deployment template has a hardcoded `annotations` block. This prevents users from injecting critical metadata required by various ecosystem tools that rely on Pod-level annotations. ### Example Use Cases * **Consul Service Mesh:** Requires `consul.hashicorp.com/connect-inject` to inject sidecar proxies for secure mTLS communication (e.g., securing OTLP traffic on TCP port 4317). * **Custom Metrics Scrapers:** While Prometheus annotations are hardcoded, users may have custom scraping requirements or use alternative observability platforms (like Datadog or New Relic) that require specific pod-level tags. ### Changes * This adds the `podAnnotations` field to the jaeger values section and its usage to the `all-in-one` deployment template. * Move the default configuration for prometheus scraping setup from the template to the values. * Ensured usage of the same pattern as the spark, esIndexCleaner, esRollover, and esLookback job templates. * The legacy components such as `query` supported `podAnnotations` the same way the other components still do. ### Checklist - [x] helm lint charts/jaeger passes - [x] helm template renders correctly with default values (no extra extra annotations on pod level) - [x] helm template renders correctly with extra annotations set (pod annotations appear in output) - [x] CI values files render cleanly Signed-off-by: Michael Jung <mike_jung@gmx.net>
1 parent 3f2e11f commit f8149de

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

charts/jaeger/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common
33
repository: https://charts.bitnami.com/bitnami
4-
version: 2.34.0
5-
digest: sha256:63de10c1f68bedef391890484e1e29f2efd54e6dc7239ca60f0a572042efd4f3
6-
generated: "2026-02-03T13:47:26.844621Z"
4+
version: 2.36.0
5+
digest: sha256:a9e48d71c1ab826e89a4115379550999c1787634d834acfe22122560393685b4
6+
generated: "2026-02-11T16:40:36.0392565+01:00"

charts/jaeger/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: 2.19.0
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
55
type: application
6-
version: 4.11.1
6+
version: 4.11.2
77
# Artifact Hub annotations
88
# The jaeger image is whitelisted from security scanning because the reported
99
# CVEs are in the upstream Alpine base image (OpenSSL libcrypto3/libssl3) and

charts/jaeger/templates/jaeger/jaeger-deploy.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ spec:
3636
{{- toYaml .Values.jaeger.podLabels | nindent 8 }}
3737
{{- end }}
3838
annotations:
39-
prometheus.io/port: "8888"
40-
prometheus.io/scrape: "true"
39+
{{- if .Values.jaeger.podAnnotations }}
40+
{{- toYaml .Values.jaeger.podAnnotations | nindent 8 }}
41+
{{- end }}
4142
spec:
4243
{{- include "jaeger.imagePullSecrets" . | nindent 6 }}
4344
containers:

charts/jaeger/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@ jaeger:
239239
tolerations: []
240240
affinity: {}
241241
topologySpreadContraints: []
242+
podAnnotations:
243+
prometheus.io/port: "8888"
244+
prometheus.io/scrape: "true"
242245
podSecurityContext:
243246
runAsUser: 10001
244247
runAsGroup: 10001

0 commit comments

Comments
 (0)