Skip to content

Commit 691f3a6

Browse files
beyangbeyang
authored
Jaeger without the Jaeger Operator (sourcegraph#559)
* delete Jaeger operator * non-operator Jaeger, with sourcegraph-built Jaeger images * do not require ingress in restricted integration test and make the test more robust
1 parent fd82fea commit 691f3a6

23 files changed

+469
-236
lines changed

‎.buildkite/integration-restricted-test.sh

100644100755
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ set -ex
44

55
cd $(dirname "${BASH_SOURCE[0]}")/..
66

7-
export DEPLOY_SOURCEGRAPH_ROOT=$(pwd)
87
export TEST_GCP_PROJECT=sourcegraph-server
98
export TEST_GCP_ZONE=us-central1-a
109
export TEST_GCP_USERNAME=buildkite@sourcegraph-dev.iam.gserviceaccount.com
11-
export BUILD_CREATOR=${BUILDKITE_BUILD_CREATOR_EMAIL//[@.]/-}
10+
export BUILD_CREATOR="$(echo $BUILDKITE_BUILD_CREATOR | tr ' @./' '_' | tr 'A-Z' 'a-z')"
1211
export BUILD_UUID=$BUILDKITE_BUILD_ID
13-
export BUILD_BRANCH=${BUILDKITE_BRANCH//./-}
12+
export BUILD_BRANCH="$(echo $BUILDKITE_BRANCH | tr ' @./' '_' | tr 'A-Z' 'a-z')"
1413

15-
${DEPLOY_SOURCEGRAPH_ROOT}/tests/integration/restricted/test.sh
14+
./tests/integration/restricted/test.sh
1615

‎.buildkite/integration-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export DEPLOY_SOURCEGRAPH_ROOT=$(pwd)
88
export TEST_GCP_PROJECT=sourcegraph-server
99
export TEST_GCP_ZONE=us-central1-a
1010
export TEST_GCP_USERNAME=buildkite@sourcegraph-dev.iam.gserviceaccount.com
11-
export BUILD_CREATOR=$BUILDKITE_BUILD_CREATOR
11+
export BUILD_CREATOR="$(echo $BUILDKITE_BUILD_CREATOR | tr ' /@.' '_' | tr 'A-Z' 'a-z')"
1212

1313
export GENERATED_BASE=`mktemp -d`
1414

‎README.dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ minikube start
9595
kubectl create ns src
9696
kubens src
9797
./kubectl-apply-all.sh
98-
kubectl expose deployment sourcegraph-frontend --type=NodePort --name sourcegraph
98+
kubectl expose deployment sourcegraph-frontend --type=NodePort --name sourcegraph --port=3080 --target-port=3080
9999
minikube service list
100100
```
101101

‎base/frontend/sourcegraph-frontend.Deployment.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,33 @@ spec:
8888
volumeMounts:
8989
- mountPath: /mnt/cache
9090
name: cache-ssd
91+
- image: sourcegraph/jaeger-agent:1.17.1
92+
name: jaeger-agent
93+
env:
94+
- name: POD_NAME
95+
valueFrom:
96+
fieldRef:
97+
apiVersion: v1
98+
fieldPath: metadata.name
99+
ports:
100+
- containerPort: 5775
101+
protocol: UDP
102+
- containerPort: 5778
103+
protocol: TCP
104+
- containerPort: 6831
105+
protocol: UDP
106+
- containerPort: 6832
107+
protocol: UDP
108+
resources:
109+
limits:
110+
cpu: "1"
111+
memory: 500M
112+
requests:
113+
cpu: 100m
114+
memory: 100M
115+
args:
116+
- --reporter.grpc.host-port=jaeger-collector:14250
117+
- --reporter.type=grpc
91118
serviceAccountName: sourcegraph-frontend
92119
volumes:
93120
- emptyDir: {}

‎base/github-proxy/github-proxy.Deployment.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,30 @@ spec:
3838
requests:
3939
cpu: 100m
4040
memory: 250M
41+
- image: sourcegraph/jaeger-agent:1.17.1
42+
name: jaeger-agent
43+
env:
44+
- name: POD_NAME
45+
valueFrom:
46+
fieldRef:
47+
apiVersion: v1
48+
fieldPath: metadata.name
49+
ports:
50+
- containerPort: 5775
51+
protocol: UDP
52+
- containerPort: 5778
53+
protocol: TCP
54+
- containerPort: 6831
55+
protocol: UDP
56+
- containerPort: 6832
57+
protocol: UDP
58+
resources:
59+
limits:
60+
cpu: "1"
61+
memory: 500M
62+
requests:
63+
cpu: 100m
64+
memory: 100M
65+
args:
66+
- --reporter.grpc.host-port=jaeger-collector:14250
67+
- --reporter.type=grpc

‎base/gitserver/gitserver.StatefulSet.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,33 @@ spec:
5252
# about configuring gitserver to use an SSH key
5353
# - mountPath: /root/.ssh
5454
# name: ssh
55+
- image: sourcegraph/jaeger-agent:1.17.1
56+
name: jaeger-agent
57+
env:
58+
- name: POD_NAME
59+
valueFrom:
60+
fieldRef:
61+
apiVersion: v1
62+
fieldPath: metadata.name
63+
ports:
64+
- containerPort: 5775
65+
protocol: UDP
66+
- containerPort: 5778
67+
protocol: TCP
68+
- containerPort: 6831
69+
protocol: UDP
70+
- containerPort: 6832
71+
protocol: UDP
72+
resources:
73+
limits:
74+
cpu: "1"
75+
memory: 500M
76+
requests:
77+
cpu: 100m
78+
memory: 100M
79+
args:
80+
- --reporter.grpc.host-port=jaeger-collector:14250
81+
- --reporter.type=grpc
5582
volumes:
5683
- name: repos
5784
# See the customization guide (../../../docs/configure.md) for information

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: jaeger-collector
5+
labels:
6+
deploy: sourcegraph
7+
app: jaeger
8+
app.kubernetes.io/name: jaeger
9+
app.kubernetes.io/component: collector
10+
spec:
11+
ports:
12+
- name: jaeger-collector-tchannel
13+
port: 14267
14+
protocol: TCP
15+
targetPort: 14267
16+
- name: jaeger-collector-http
17+
port: 14268
18+
protocol: TCP
19+
targetPort: 14268
20+
- name: jaeger-collector-grpc
21+
port: 14250
22+
protocol: TCP
23+
targetPort: 14250
24+
selector:
25+
app.kubernetes.io/name: jaeger
26+
app.kubernetes.io/component: all-in-one
27+
type: ClusterIP

‎base/jaeger/jaeger-query.Service.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: jaeger-query
5+
labels:
6+
deploy: sourcegraph
7+
app: jaeger
8+
app.kubernetes.io/name: jaeger
9+
app.kubernetes.io/component: query
10+
spec:
11+
ports:
12+
- name: query-http
13+
port: 16686
14+
protocol: TCP
15+
targetPort: 16686
16+
selector:
17+
app.kubernetes.io/name: jaeger
18+
app.kubernetes.io/component: all-in-one
19+
type: ClusterIP

‎base/jaeger/jaeger.Deployment.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
apiVersion: extensions/v1beta1
2+
kind: Deployment
3+
metadata:
4+
name: jaeger
5+
labels:
6+
deploy: sourcegraph
7+
app: jaeger
8+
app.kubernetes.io/name: jaeger
9+
app.kubernetes.io/component: all-in-one
10+
spec:
11+
replicas: 1
12+
strategy:
13+
type: Recreate
14+
template:
15+
metadata:
16+
labels:
17+
app: jaeger
18+
app.kubernetes.io/name: jaeger
19+
app.kubernetes.io/component: all-in-one
20+
annotations:
21+
prometheus.io/scrape: "true"
22+
prometheus.io/port: "16686"
23+
spec:
24+
containers:
25+
- image: sourcegraph/jaeger-all-in-one:1.17.1
26+
name: jaeger
27+
args: ["--memory.max-traces=20000"]
28+
ports:
29+
- containerPort: 5775
30+
protocol: UDP
31+
- containerPort: 6831
32+
protocol: UDP
33+
- containerPort: 6832
34+
protocol: UDP
35+
- containerPort: 5778
36+
protocol: TCP
37+
- containerPort: 16686
38+
protocol: TCP
39+
- containerPort: 14250
40+
protocol: TCP
41+
readinessProbe:
42+
httpGet:
43+
path: "/"
44+
port: 14269
45+
initialDelaySeconds: 5
46+
resources:
47+
limits:
48+
cpu: 1
49+
memory: 1G
50+
requests:
51+
cpu: 500m
52+
memory: 500M

‎base/query-runner/query-runner.Deployment.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,30 @@ spec:
3838
requests:
3939
cpu: 500m
4040
memory: 1G
41+
- image: sourcegraph/jaeger-agent:1.17.1
42+
name: jaeger-agent
43+
env:
44+
- name: POD_NAME
45+
valueFrom:
46+
fieldRef:
47+
apiVersion: v1
48+
fieldPath: metadata.name
49+
ports:
50+
- containerPort: 5775
51+
protocol: UDP
52+
- containerPort: 5778
53+
protocol: TCP
54+
- containerPort: 6831
55+
protocol: UDP
56+
- containerPort: 6832
57+
protocol: UDP
58+
resources:
59+
limits:
60+
cpu: "1"
61+
memory: 500M
62+
requests:
63+
cpu: 100m
64+
memory: 100M
65+
args:
66+
- --reporter.grpc.host-port=jaeger-collector:14250
67+
- --reporter.type=grpc

0 commit comments

Comments
 (0)