Remove GitHub proxy service (#49)

See sourcegraph/sourcegraph#55290, we're removing this service in favor of deployment simplicity with a redis-based equivalent.
sourcegraph · Oct 12, 2023 · 20b3321 · 20b3321
1 parent 602da27
commit 20b3321
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 63 deletions.
diff --git a/prometheus/prometheus_targets.yml b/prometheus/prometheus_targets.yml
@@ -5,11 +5,6 @@
   targets:
     - cadvisor:8080
     - sourcegraph-frontend-internal:6060
-- labels:
-    nodename: "sourcegraph-docker-compose-host"
-    job: github-proxy
-  targets:
-    - github-proxy:6060
 - labels:
     nodename: "sourcegraph-docker-compose-host"
     job: repo-updater

diff --git a/pure-docker/deploy-frontend-internal.sh b/pure-docker/deploy-frontend-internal.sh
@@ -37,7 +37,6 @@ docker run --detach \
     -e REPO_UPDATER_URL=http://repo-updater:3182 \
     -e GRAFANA_SERVER_URL=http://grafana:3000 \
     -e JAEGER_SERVER_URL=http://jaeger:16686 \
-    -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -e PROMETHEUS_URL=http://prometheus:9090 \
     -e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
     -e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \

diff --git a/pure-docker/deploy-frontend.sh b/pure-docker/deploy-frontend.sh
@@ -38,7 +38,6 @@ docker run --detach \
     -e REPO_UPDATER_URL=http://repo-updater:3182 \
     -e GRAFANA_SERVER_URL=http://grafana:3370 \
     -e JAEGER_SERVER_URL=http://jaeger:16686 \
-    -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -e PROMETHEUS_URL=http://prometheus:9090 \
     -e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
     -e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \

diff --git a/pure-docker/deploy-github-proxy.sh b/pure-docker/deploy-github-proxy.sh
diff --git a/pure-docker/deploy-gitserver.sh b/pure-docker/deploy-gitserver.sh
@@ -22,7 +22,6 @@ docker run --detach \
     -e GOMAXPROCS=4 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
     -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-    -e 'GITHUB_BASE_URL=http://github-proxy:3180' \
     -v $VOLUME:/data/repos \
     index.docker.io/sourcegraph/gitserver:4.4.0@sha256:ffef2bc4b9fbcfdb0b833230990af458260787ff3903de64108846ae375d17e6
 

diff --git a/pure-docker/deploy-repo-updater.sh b/pure-docker/deploy-repo-updater.sh
@@ -21,7 +21,6 @@ docker run --detach \
     -e GOMAXPROCS=1 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
     -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-    -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -v $VOLUME:/mnt/cache \
     index.docker.io/sourcegraph/repo-updater:4.4.0@sha256:e4b71290ec21a6471eb4b9e1efb169af96212b7dfa72d9fd22ea722a49b3c707
 

diff --git a/pure-docker/deploy-worker.sh b/pure-docker/deploy-worker.sh
@@ -21,7 +21,6 @@ docker run --detach \
     -e GOMAXPROCS=1 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
     -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-    -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
     -e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
     -e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \

diff --git a/pure-docker/deploy.sh b/pure-docker/deploy.sh
@@ -13,7 +13,6 @@ docker network create sourcegraph &>/dev/null || true
 ./deploy-apache.sh
 ./deploy-node-exporter.sh
 ./deploy-cadvisor.sh
-./deploy-github-proxy.sh
 for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
 ./deploy-grafana.sh
 ./deploy-precise-code-intel-worker.sh

diff --git a/pure-docker/teardown.sh b/pure-docker/teardown.sh
@@ -8,30 +8,29 @@ source ./replicas.sh
 
 docker rm -f apache &>/dev/null || true &
 docker rm -f node-exporter &>/dev/null || true &
-docker rm -f cadvisor &> /dev/null || true &
-docker rm -f sourcegraph-frontend-internal &> /dev/null || true &
-docker rm -f $(addresses "sourcegraph-frontend-" $NUM_FRONTEND "") &> /dev/null || true &
-docker rm -f github-proxy &> /dev/null || true &
-docker rm -f $(addresses "gitserver-" $NUM_GITSERVER "") &> /dev/null || true &
-docker rm -f grafana &> /dev/null || true
-docker rm -f jaeger &> /dev/null || true
-docker rm -f precise-code-intel-worker &> /dev/null || true
-docker rm -f pgsql &> /dev/null || true &
-docker rm -f codeintel-db &> /dev/null || true &
-docker rm -f codeinsights-db &> /dev/null || true &
-docker rm -f blobstore &> /dev/null || true &
-docker rm -f migrator &> /dev/null || true &
-docker rm -f prometheus &> /dev/null || true
-docker rm -f redis-cache &> /dev/null || true &
-docker rm -f redis-store &> /dev/null || true &
-docker rm -f repo-updater &> /dev/null || true &
-docker rm -f worker &> /dev/null || true &
-docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &> /dev/null || true &
-docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &> /dev/null || true &
-docker rm -f syntect-server &> /dev/null || true &
-docker rm -f $(addresses "zoekt-indexserver-" $NUM_INDEXED_SEARCH "") &> /dev/null || true &
-docker rm -f $(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH "") &> /dev/null || true &
-docker rm -f otel-collector &> /dev/null || true &
+docker rm -f cadvisor &>/dev/null || true &
+docker rm -f sourcegraph-frontend-internal &>/dev/null || true &
+docker rm -f $(addresses "sourcegraph-frontend-" $NUM_FRONTEND "") &>/dev/null || true &
+docker rm -f $(addresses "gitserver-" $NUM_GITSERVER "") &>/dev/null || true &
+docker rm -f grafana &>/dev/null || true
+docker rm -f jaeger &>/dev/null || true
+docker rm -f precise-code-intel-worker &>/dev/null || true
+docker rm -f pgsql &>/dev/null || true &
+docker rm -f codeintel-db &>/dev/null || true &
+docker rm -f codeinsights-db &>/dev/null || true &
+docker rm -f blobstore &>/dev/null || true &
+docker rm -f migrator &>/dev/null || true &
+docker rm -f prometheus &>/dev/null || true
+docker rm -f redis-cache &>/dev/null || true &
+docker rm -f redis-store &>/dev/null || true &
+docker rm -f repo-updater &>/dev/null || true &
+docker rm -f worker &>/dev/null || true &
+docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &>/dev/null || true &
+docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &>/dev/null || true &
+docker rm -f syntect-server &>/dev/null || true &
+docker rm -f $(addresses "zoekt-indexserver-" $NUM_INDEXED_SEARCH "") &>/dev/null || true &
+docker rm -f $(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH "") &>/dev/null || true &
+docker rm -f otel-collector &>/dev/null || true &
 
-docker network rm sourcegraph &> /dev/null || true &
+docker network rm sourcegraph &>/dev/null || true &
 wait
diff --git a/test/smoke-test.sh b/test/smoke-test.sh
@@ -7,7 +7,7 @@ deploy_sourcegraph() {
 	./test/volume-config.sh
 	timeout 600s ./pure-docker/deploy.sh
 
-	expect_containers="61"
+	expect_containers="60"
 
 	echo "Giving containers 90s to start..."
 	sleep 90