From 6e1bd91c8a2b3fb808a0e24673edf391619dc803 Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Thu, 19 Mar 2026 12:26:22 -0700
Subject: [PATCH] chore/platform: update k8s to support jaeger 2.16 config
 (#427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description

closes PLAT-486

Update manifests to support 2.16 jaeger configurations style

This follows changes to the sourcegraph jaeger base image
https://github.com/sourcegraph/sourcegraph/pull/10912

## Test plan

`kubectl kustomize base/monitoring/jaeger`

<details>

```
➜  deploy-sourcegraph-k8s git:(wg/plat/jaeger-2.16) ✗ kubectl kustomize base/monitoring/jaeger
apiVersion: v1
kind: Service
metadata:
  labels:
    app: jaeger
    app.kubernetes.io/component: jaeger
    app.kubernetes.io/name: jaeger
    deploy: sourcegraph
    sourcegraph-resource-requires: no-cluster-admin
  name: jaeger-collector
spec:
  ports:
  - name: http-otlp
    port: 4318
    protocol: TCP
    targetPort: http-otlp
  - name: grpc-otlp
    port: 4317
    protocol: TCP
    targetPort: grpc-otlp
  selector:
    app.kubernetes.io/component: all-in-one
    app.kubernetes.io/name: jaeger
  type: ClusterIP
---
apiVersion: v1
kind: Service
metadata:
  labels:
    app: jaeger
    app.kubernetes.io/component: jaeger
    app.kubernetes.io/name: jaeger
    deploy: sourcegraph
    sourcegraph-resource-requires: no-cluster-admin
  name: jaeger-query
spec:
  ports:
  - name: query-http
    port: 16686
    protocol: TCP
    targetPort: 16686
  selector:
    app.kubernetes.io/component: all-in-one
    app.kubernetes.io/name: jaeger
  type: ClusterIP
---
apiVersion: apps/v1
kind: Deployment
metadata:
  labels:
    app: jaeger
    app.kubernetes.io/component: jaeger
    app.kubernetes.io/name: jaeger
    deploy: sourcegraph
    sourcegraph-resource-requires: no-cluster-admin
  name: jaeger
spec:
  replicas: 1
  selector:
    matchLabels:
      app: jaeger
      app.kubernetes.io/component: all-in-one
      app.kubernetes.io/name: jaeger
  strategy:
    type: Recreate
  template:
    metadata:
      annotations:
        prometheus.io/port: "16686"
        prometheus.io/scrape: "true"
      labels:
        app: jaeger
        app.kubernetes.io/component: all-in-one
        app.kubernetes.io/name: jaeger
        deploy: sourcegraph
    spec:
      containers:
      - args:
        - --config=/etc/jaeger/jaeger-config.yaml
        image: index.docker.io/sourcegraph/jaeger-all-in-one:6.2.1106@sha256:c1ee8d613be75032066a9da24f54ebae19eacb63e42338e920abd6383ce168a6
        name: jaeger
        ports:
        - containerPort: 5778
          protocol: TCP
        - containerPort: 16686
          name: http
          protocol: TCP
        - containerPort: 4317
          name: grpc-otlp
          protocol: TCP
        - containerPort: 4318
          name: http-otlp
          protocol: TCP
        - containerPort: 13133
          name: health
          protocol: TCP
        readinessProbe:
          httpGet:
            path: /status
            port: 13133
          initialDelaySeconds: 5
        resources:
          limits:
            cpu: "1"
            memory: 1G
          requests:
            cpu: 500m
            memory: 500M
        securityContext:
          allowPrivilegeEscalation: false
          runAsGroup: 101
          runAsUser: 100
      securityContext:
        fsGroup: 101
        fsGroupChangePolicy: OnRootMismatch
        runAsUser: 100
```

</details>

(cherry picked from commit 3adbbdd73c5d7e92d07ace2c2636d12bb6174f81)
---
 .../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: