Skip to content

Commit 6e1bd91

Browse files
DaedalusGgithub-actions[bot]
authored andcommitted
chore/platform: update k8s to support jaeger 2.16 config (#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> (cherry picked from commit 3adbbdd)
1 parent 6fa2541 commit 6e1bd91

2 files changed

Lines changed: 17 additions & 21 deletions

File tree

base/monitoring/jaeger/jaeger-collector.Service.yaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,14 @@ metadata:
1010
app.kubernetes.io/name: jaeger
1111
spec:
1212
ports:
13-
- name: jaeger-collector-tchannel
14-
port: 14267
13+
- name: http-otlp
14+
port: 4318
1515
protocol: TCP
16-
targetPort: 14267
17-
- name: jaeger-collector-http
18-
port: 4321
16+
targetPort: http-otlp
17+
- name: grpc-otlp
18+
port: 4317
1919
protocol: TCP
20-
targetPort: 4321
21-
- name: jaeger-collector-grpc
22-
port: 4320
23-
protocol: TCP
24-
targetPort: 4320
20+
targetPort: grpc-otlp
2521
selector:
2622
app.kubernetes.io/name: jaeger
2723
app.kubernetes.io/component: all-in-one

base/monitoring/jaeger/jaeger.Deployment.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@ spec:
3131
containers:
3232
- name: jaeger
3333
image: index.docker.io/sourcegraph/jaeger-all-in-one:6.2.1106@sha256:c1ee8d613be75032066a9da24f54ebae19eacb63e42338e920abd6383ce168a6
34-
args: ["--memory.max-traces=20000", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled"]
34+
args: ["--config=/etc/jaeger/jaeger-config.yaml"]
3535
ports:
36-
- containerPort: 5775
37-
protocol: UDP
38-
- containerPort: 6831
39-
protocol: UDP
40-
- containerPort: 6832
41-
protocol: UDP
4236
- containerPort: 5778
4337
protocol: TCP
4438
- containerPort: 16686
39+
name: http
4540
protocol: TCP
46-
- containerPort: 4320
41+
- containerPort: 4317
42+
name: grpc-otlp
4743
protocol: TCP
48-
- containerPort: 4321
44+
- containerPort: 4318
45+
name: http-otlp
46+
protocol: TCP
47+
- containerPort: 13133
48+
name: health
4949
protocol: TCP
5050
readinessProbe:
5151
httpGet:
52-
path: "/"
53-
port: 14269
52+
path: "/status"
53+
port: 13133
5454
initialDelaySeconds: 5
5555
resources:
5656
limits:

0 commit comments

Comments
 (0)