From 2ad8198b2d9bf169db289551a8259649e0e4b0e0 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Tue, 17 Mar 2026 21:59:09 -0700 Subject: [PATCH] update k8s to support jaeger 2.16 config --- .../jaeger/jaeger-collector.Service.yaml | 16 +++++--------- base/monitoring/jaeger/jaeger.Deployment.yaml | 22 +++++++++---------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/base/monitoring/jaeger/jaeger-collector.Service.yaml b/base/monitoring/jaeger/jaeger-collector.Service.yaml index 2e714724..7ded3332 100644 --- a/base/monitoring/jaeger/jaeger-collector.Service.yaml +++ b/base/monitoring/jaeger/jaeger-collector.Service.yaml @@ -10,18 +10,14 @@ metadata: app.kubernetes.io/name: jaeger spec: ports: - - name: jaeger-collector-tchannel - port: 14267 + - name: http-otlp + port: 4318 protocol: TCP - targetPort: 14267 - - name: jaeger-collector-http - port: 4321 + targetPort: http-otlp + - name: grpc-otlp + port: 4317 protocol: TCP - targetPort: 4321 - - name: jaeger-collector-grpc - port: 4320 - protocol: TCP - targetPort: 4320 + targetPort: grpc-otlp selector: app.kubernetes.io/name: jaeger app.kubernetes.io/component: all-in-one diff --git a/base/monitoring/jaeger/jaeger.Deployment.yaml b/base/monitoring/jaeger/jaeger.Deployment.yaml index 89796e7d..5f83fbf1 100644 --- a/base/monitoring/jaeger/jaeger.Deployment.yaml +++ b/base/monitoring/jaeger/jaeger.Deployment.yaml @@ -31,26 +31,26 @@ spec: containers: - name: jaeger image: index.docker.io/sourcegraph/jaeger-all-in-one:6.2.1106@sha256:c1ee8d613be75032066a9da24f54ebae19eacb63e42338e920abd6383ce168a6 - args: ["--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled"] + args: ["--config=/etc/jaeger/jaeger-config.yaml"] ports: - - containerPort: 5775 - protocol: UDP - - containerPort: 6831 - protocol: UDP - - containerPort: 6832 - protocol: UDP - containerPort: 5778 protocol: TCP - containerPort: 16686 + name: http protocol: TCP - - containerPort: 4320 + - containerPort: 4317 + name: grpc-otlp protocol: TCP - - containerPort: 4321 + - containerPort: 4318 + name: http-otlp + protocol: TCP + - containerPort: 13133 + name: health protocol: TCP readinessProbe: httpGet: - path: "/" - port: 14269 + path: "/status" + port: 13133 initialDelaySeconds: 5 resources: limits: