diff --git a/prometheus/prometheus_targets.yml b/prometheus/prometheus_targets.yml index 016fec3e..fdf08da0 100644 --- 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: repo-updater - targets: - - repo-updater:6060 - labels: nodename: "sourcegraph-docker-compose-host" job: worker diff --git a/pure-docker/deploy-frontend-internal.sh b/pure-docker/deploy-frontend-internal.sh index 5518ad8d..ba7c225b 100755 --- a/pure-docker/deploy-frontend-internal.sh +++ b/pure-docker/deploy-frontend-internal.sh @@ -34,7 +34,6 @@ docker run --detach \ -e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \ -e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \ -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \ - -e REPO_UPDATER_URL=http://repo-updater:3182 \ -e GRAFANA_SERVER_URL=http://grafana:3000 \ -e JAEGER_SERVER_URL=http://jaeger:16686 \ -e PROMETHEUS_URL=http://prometheus:9090 \ diff --git a/pure-docker/deploy-frontend.sh b/pure-docker/deploy-frontend.sh index d30520d7..5fdb0843 100755 --- a/pure-docker/deploy-frontend.sh +++ b/pure-docker/deploy-frontend.sh @@ -35,7 +35,6 @@ docker run --detach \ -e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \ -e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \ -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \ - -e REPO_UPDATER_URL=http://repo-updater:3182 \ -e GRAFANA_SERVER_URL=http://grafana:3370 \ -e JAEGER_SERVER_URL=http://jaeger:16686 \ -e PROMETHEUS_URL=http://prometheus:9090 \ diff --git a/pure-docker/deploy-repo-updater.sh b/pure-docker/deploy-repo-updater.sh deleted file mode 100755 index f7cc9ac5..00000000 --- a/pure-docker/deploy-repo-updater.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -set -e -source ./replicas.sh - -# Description: Handles repository metadata (not Git data) lookups and updates from external code hosts and other similar services. -# -# Disk: 128GB / non-persistent SSD -# Network: 100mbps -# Liveness probe: n/a -# Ports exposed to other Sourcegraph services: 3182/TCP 6060/TCP -# Ports exposed to the public internet: none -# -VOLUME="$HOME/sourcegraph-docker/repo-updater-disk" -./ensure-volume.sh $VOLUME 100 -docker run --detach \ - --name=repo-updater \ - --network=sourcegraph \ - --restart=always \ - --cpus=4 \ - --memory=4g \ - -e GOMAXPROCS=1 \ - -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \ - -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \ - -v $VOLUME:/mnt/cache \ - index.docker.io/sourcegraph/repo-updater:4.4.0@sha256:e4b71290ec21a6471eb4b9e1efb169af96212b7dfa72d9fd22ea722a49b3c707 - -echo "Deployed repo-updater service" diff --git a/pure-docker/deploy.sh b/pure-docker/deploy.sh index 7ec43628..c26cbf15 100755 --- a/pure-docker/deploy.sh +++ b/pure-docker/deploy.sh @@ -23,7 +23,6 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done ./deploy-prometheus.sh ./deploy-redis-cache.sh ./deploy-redis-store.sh -./deploy-repo-updater.sh ./deploy-worker.sh ./deploy-otel-collector.sh for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done diff --git a/pure-docker/teardown.sh b/pure-docker/teardown.sh index 41d3c65c..72990543 100755 --- a/pure-docker/teardown.sh +++ b/pure-docker/teardown.sh @@ -23,7 +23,6 @@ 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 & diff --git a/test/pure-docker/Vagrantfile b/test/pure-docker/Vagrantfile index d2e791e9..2aafc9c9 100644 --- a/test/pure-docker/Vagrantfile +++ b/test/pure-docker/Vagrantfile @@ -53,7 +53,7 @@ Vagrant.configure("2") do |config| echo "forcing static permissions on volume directories" echo pushd ~/sourcegraph-docker - chown -R 100:101 gitserver* lsif-server* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* + chown -R 100:101 gitserver* lsif-server* prometheus-v2* searcher* sourcegraph-frontend* symbols* zoekt* chown -R 999:1000 redis-store-disk redis-cache-disk chown -R 472:472 grafana-disk chown -R 999:999 pgsql-disk diff --git a/test/pure-docker/volume-config.sh b/test/pure-docker/volume-config.sh index 0d72258e..da815035 100755 --- a/test/pure-docker/volume-config.sh +++ b/test/pure-docker/volume-config.sh @@ -18,7 +18,7 @@ echo echo "forcing static permissions on volume directories" echo pushd ~/sourcegraph-docker -chown -R 100:101 gitserver* lsif-server* prometheus-v2* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* minio-disk +chown -R 100:101 gitserver* lsif-server* prometheus-v2* searcher* sourcegraph-frontend* symbols* zoekt* minio-disk chown -R 999:1000 redis-store-disk redis-cache-disk chown -R 472:472 grafana-disk chown -R 999:999 pgsql-disk codeintel-db-disk diff --git a/test/volume-config.sh b/test/volume-config.sh index f298734a..107268da 100755 --- a/test/volume-config.sh +++ b/test/volume-config.sh @@ -18,7 +18,7 @@ echo echo "forcing static permissions on volume directories" echo pushd ~/sourcegraph-docker -chown -R 100:101 gitserver* prometheus-v2* worker* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk +chown -R 100:101 gitserver* prometheus-v2* worker* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk chown -R 999:1000 redis-store-disk redis-cache-disk chown -R 472:472 grafana-disk chown -R 999:999 pgsql-disk codeintel-db-disk