Skip to content

chore/platform: update k8s to support jaeger 2.16 config#427

Merged
DaedalusG merged 1 commit intomainfrom
wg/plat/jaeger-2.16
Mar 19, 2026
Merged

chore/platform: update k8s to support jaeger 2.16 config#427
DaedalusG merged 1 commit intomainfrom
wg/plat/jaeger-2.16

Conversation

@DaedalusG
Copy link
Contributor

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

@DaedalusG DaedalusG requested review from a team and loujar March 18, 2026 05:02
@DaedalusG DaedalusG merged commit 3adbbdd into main Mar 19, 2026
3 checks passed
@DaedalusG DaedalusG added the backport 7.1.x Backport to 7.1.x release branch label Mar 19, 2026
@sourcegraph-release-bot
Copy link
Contributor

The backport to 7.1.x failed at https://github.com/sourcegraph/deploy-sourcegraph-k8s/actions/runs/23313015361:

Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the sourcegraph/deploy-sourcegraph-k8s repository.

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 7.1.x -p 427
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.1.x 7.1.x
# Navigate to the new working tree
cd .worktrees/backport-7.1.x
# Create a new branch
git switch --create backport-427-to-7.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3adbbdd73c5d7e92d07ace2c2636d12bb6174f81
# Push it to GitHub
git push --set-upstream origin backport-427-to-7.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.1.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-427-to-7.1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.1.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 7.1.x and the compare/head branch is backport-427-to-7.1.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

DaedalusG added a commit that referenced this pull request Mar 19, 2026
…nfig (#428)

Backport 3adbbdd from #427

## Description

closes PLAT-486

Update manifests to support 2.16 jaeger configurations style

This follows changes to the sourcegraph jaeger base image
sourcegraph/sourcegraph#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>

Co-authored-by: Warren Gifford <warrenbruceg@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants