Skip to content

Commit 216c11b

Browse files
eseligereseliger
authored
Remove GitHub proxy service (#942)
See sourcegraph/sourcegraph#55290, we're removing this service in favor of deployment simplicity with a redis-based equivalent.
1 parent 60ef9eb commit 216c11b

File tree

12 files changed

+27
-92
lines changed

12 files changed

+27
-92
lines changed

‎docker-compose/docker-compose.yaml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ services:
141141
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
142142
- 'REPO_UPDATER_URL=http://repo-updater:3182'
143143
- 'GRAFANA_SERVER_URL=http://grafana:3370'
144-
- 'GITHUB_BASE_URL=http://github-proxy:3180'
145144
- 'PROMETHEUS_URL=http://prometheus:9090'
146145
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
147146
- 'PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
@@ -154,7 +153,6 @@ services:
154153
{ "Name": "searcher-0", "Host": "searcher-0:6060" },
155154
{ "Name": "symbols-0", "Host": "symbols-0:6060" },
156155
{ "Name": "repo-updater", "Host": "repo-updater:6060" },
157-
{ "Name": "github-proxy", "Host": "github-proxy:6060" },
158156
{ "Name": "worker", "Host": "worker:6060" },
159157
{ "Name": "zoekt-indexserver-0", "Host": "zoekt-indexserver-0:6072" },
160158
{ "Name": "zoekt-webserver-0", "Host": "zoekt-webserver-0:6070", "DefaultPath": "/debug/requests/" }
@@ -198,7 +196,6 @@ services:
198196
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
199197
- 'REPO_UPDATER_URL=http://repo-updater:3182'
200198
- 'GRAFANA_SERVER_URL=http://grafana:3000'
201-
- 'GITHUB_BASE_URL=http://github-proxy:3180'
202199
- 'PROMETHEUS_URL=http://prometheus:9090'
203200
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
204201
- 'PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
@@ -236,7 +233,6 @@ services:
236233
environment:
237234
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
238235
- 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
239-
- 'GITHUB_BASE_URL=http://github-proxy:3180'
240236
volumes:
241237
- 'gitserver-0:/data/repos'
242238
networks:
@@ -321,26 +317,6 @@ services:
321317
- sourcegraph
322318
restart: always
323319

324-
# Description: Rate-limiting proxy for the GitHub API.
325-
#
326-
# CPU: 1
327-
# Memory: 1GB
328-
# Disk: 1GB / non-persistent SSD (only for read-only config file)
329-
# Ports exposed to other Sourcegraph services: 3180/TCP 6060/TCP
330-
# Ports exposed to the public internet: none
331-
#
332-
github-proxy:
333-
container_name: github-proxy
334-
image: 'index.docker.io/sourcegraph/github-proxy:216430_2023-05-02_5.0-3cc9006de32c@sha256:30d4550f51febc1e32ec8af175ef8cce4d1706fd75468572da86f6da451f546f'
335-
cpus: 1
336-
mem_limit: '1g'
337-
environment:
338-
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
339-
- 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
340-
networks:
341-
- sourcegraph
342-
restart: always
343-
344320
# Description: Handles conversion of uploaded precise code intelligence bundles.
345321
#
346322
# Ports exposed to other Sourcegraph services: 3188/TCP
@@ -380,7 +356,6 @@ services:
380356
environment:
381357
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
382358
- 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
383-
- 'GITHUB_BASE_URL=http://github-proxy:3180'
384359
volumes:
385360
- 'repo-updater:/mnt/cache'
386361
networks:
@@ -405,7 +380,6 @@ services:
405380
- 'SEARCHER_URL=http://searcher-0:3181'
406381
- 'SYMBOLS_URL=http://symbols-0:3184'
407382
- 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070'
408-
- 'GITHUB_BASE_URL=http://github-proxy:3180'
409383
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
410384
- 'PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
411385
volumes:

‎docker-compose/embeddings/embeddings.docker-compose.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ services:
4242
{ "Name": "searcher-0", "Host": "searcher-0:6060" },
4343
{ "Name": "symbols-0", "Host": "symbols-0:6060" },
4444
{ "Name": "repo-updater", "Host": "repo-updater:6060" },
45-
{ "Name": "github-proxy", "Host": "github-proxy:6060" },
4645
{ "Name": "worker", "Host": "worker:6060" },
4746
{ "Name": "zoekt-indexserver-0", "Host": "zoekt-indexserver-0:6072" },
4847
{ "Name": "zoekt-webserver-0", "Host": "zoekt-webserver-0:6070", "DefaultPath": "/debug/requests/" },

‎prometheus/prometheus_targets.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
targets:
66
- cadvisor:8080
77
- sourcegraph-frontend-internal:6060
8-
- labels:
9-
nodename: "sourcegraph-docker-compose-host"
10-
job: github-proxy
11-
targets:
12-
- github-proxy:6060
138
- labels:
149
nodename: "sourcegraph-docker-compose-host"
1510
job: repo-updater

‎pure-docker/deploy-frontend-internal.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ docker run --detach \
3636
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
3737
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3838
-e GRAFANA_SERVER_URL=http://grafana:3000 \
39-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4039
-e PROMETHEUS_URL=http://prometheus:9090 \
4140
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
4241
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \

‎pure-docker/deploy-frontend.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ docker run --detach \
3737
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
3838
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3939
-e GRAFANA_SERVER_URL=http://grafana:3370 \
40-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4140
-e PROMETHEUS_URL=http://prometheus:9090 \
4241
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
4342
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \

‎pure-docker/deploy-github-proxy.sh‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pure-docker/deploy-gitserver.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ docker run --detach \
2222
-e GOMAXPROCS=4 \
2323
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
2424
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
25-
-e 'GITHUB_BASE_URL=http://github-proxy:3180' \
2625
-v $VOLUME:/data/repos \
2726
index.docker.io/sourcegraph/gitserver:187572_2022-12-06_cbecc5321c7d@sha256:87642b2f0cccbdcd661e470c8f7aa6c022ab03065a2c8ab565afc4b8829a4531
2827

‎pure-docker/deploy-repo-updater.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ docker run --detach \
2121
-e GOMAXPROCS=1 \
2222
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
2323
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
24-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
2524
-v $VOLUME:/mnt/cache \
2625
index.docker.io/sourcegraph/repo-updater:187572_2022-12-06_cbecc5321c7d@sha256:0bf2b95c73bceff8c3edb96299175fe36a550f57fd3f5256d38fa2c42992655a
2726

‎pure-docker/deploy-worker.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ docker run --detach \
2121
-e GOMAXPROCS=1 \
2222
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
2323
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
24-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
2524
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
2625
-e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
2726
-e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \

‎pure-docker/deploy.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ docker network create sourcegraph &>/dev/null || true
1212

1313
./deploy-node-exporter.sh
1414
./deploy-cadvisor.sh
15-
./deploy-github-proxy.sh
1615
for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
1716
./deploy-grafana.sh
1817
./deploy-precise-code-intel-worker.sh

0 commit comments

Comments
 (0)