Skip to content

Commit 5fb29bd

Browse files
authored
Remove repo-updater container (#1202)
Sister PR of sourcegraph/deploy-sourcegraph-helm#671. Upgrade info alert is at sourcegraph/docs#1110. The repo-updater service is no longer required starting with Sourcegraph 6.4. Test plan: Repo-updater-less instances have been running for a while now. ### Checklist <!-- Kubernetes and Docker Compose MUST be kept in sync. You should not merge a change here without a corresponding change in the other repository, unless it truly is specific to this repository. If uneeded, add link or explanation of why it is not needed here. --> * [x] Sister [deploy-sourcegraph](https://github.com/sourcegraph/deploy-sourcegraph) change: sourcegraph/deploy-sourcegraph#4468 * [x] Sister [customer-replica](https://github.com/sourcegraph/deploy-sourcegraph-docker-customer-replica-1) change (if necessary, for any changes affecting pure-docker or configuration): sourcegraph/deploy-sourcegraph-docker-customer-replica-1#79 * [ ] All images have a valid tag and SHA256 sum
1 parent 5ea385a commit 5fb29bd

File tree

9 files changed

+3
-63
lines changed

9 files changed

+3
-63
lines changed

docker-compose/docker-compose.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ services:
139139
- 'SYMBOLS_URL=http://symbols-0:3184'
140140
- 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070'
141141
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
142-
- 'REPO_UPDATER_URL=http://repo-updater:3182'
143142
- 'GRAFANA_SERVER_URL=http://grafana:3370'
144143
- 'PROMETHEUS_URL=http://prometheus:9090'
145144
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
@@ -152,7 +151,6 @@ services:
152151
{ "Name": "gitserver-0", "Host": "gitserver-0:6060" },
153152
{ "Name": "searcher-0", "Host": "searcher-0:6060" },
154153
{ "Name": "symbols-0", "Host": "symbols-0:6060" },
155-
{ "Name": "repo-updater", "Host": "repo-updater:6060" },
156154
{ "Name": "worker", "Host": "worker:6060" },
157155
{ "Name": "zoekt-indexserver-0", "Host": "zoekt-indexserver-0:6072" },
158156
{ "Name": "zoekt-webserver-0", "Host": "zoekt-webserver-0:6070", "DefaultPath": "/debug/requests/" }
@@ -194,7 +192,6 @@ services:
194192
- 'SYMBOLS_URL=http://symbols-0:3184'
195193
- 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070'
196194
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
197-
- 'REPO_UPDATER_URL=http://repo-updater:3182'
198195
- 'GRAFANA_SERVER_URL=http://grafana:3000'
199196
- 'PROMETHEUS_URL=http://prometheus:9090'
200197
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
@@ -342,26 +339,6 @@ services:
342339
- sourcegraph
343340
restart: always
344341

345-
# Description: Handles repository metadata (not Git data) lookups and updates from external code hosts and other similar services.
346-
#
347-
# Disk: 128GB / non-persistent SSD
348-
# Ports exposed to other Sourcegraph services: 3182/TCP 6060/TCP
349-
# Ports exposed to the public internet: none
350-
#
351-
repo-updater:
352-
container_name: repo-updater
353-
image: 'index.docker.io/sourcegraph/repo-updater:6.1.2889@sha256:95e8a28bd2d13270a5d0ab80eae5e8aac44913bd421fb92cf45d5550c4874fbc'
354-
cpus: 4
355-
mem_limit: '4g'
356-
environment:
357-
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
358-
- 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
359-
volumes:
360-
- 'repo-updater:/mnt/cache'
361-
networks:
362-
- sourcegraph
363-
restart: always
364-
365342
# Description: Manages background processes.
366343
#
367344
# Disk: 128GB / non-persistent SSD
@@ -802,7 +779,6 @@ volumes:
802779
prometheus-v2:
803780
redis-cache:
804781
redis-store:
805-
repo-updater:
806782
worker:
807783
searcher-0:
808784
sourcegraph-frontend-0:

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:48080
77
- sourcegraph-frontend-internal:6060
8-
- labels:
9-
nodename: "sourcegraph-docker-compose-host"
10-
job: repo-updater
11-
targets:
12-
- repo-updater:6060
138
- labels:
149
nodename: "sourcegraph-docker-compose-host"
1510
job: worker

pure-docker/deploy-frontend-internal.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ docker run --detach \
3434
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
3535
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
3636
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
37-
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3837
-e GRAFANA_SERVER_URL=http://grafana:3000 \
3938
-e PROMETHEUS_URL=http://prometheus:9090 \
4039
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \

pure-docker/deploy-frontend.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ docker run --detach \
3535
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
3636
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
3737
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
38-
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3938
-e GRAFANA_SERVER_URL=http://grafana:3370 \
4039
-e PROMETHEUS_URL=http://prometheus:9090 \
4140
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \

pure-docker/deploy-repo-updater.sh

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

pure-docker/deploy.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
2222
./deploy-prometheus.sh
2323
./deploy-redis-cache.sh
2424
./deploy-redis-store.sh
25-
./deploy-repo-updater.sh
2625
./deploy-worker.sh
2726
./deploy-otel-collector.sh
2827
for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done

pure-docker/teardown.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ docker rm -f migrator &>/dev/null || true &
2323
docker rm -f prometheus &>/dev/null || true
2424
docker rm -f redis-cache &>/dev/null || true &
2525
docker rm -f redis-store &>/dev/null || true &
26-
docker rm -f repo-updater &>/dev/null || true &
2726
docker rm -f worker &>/dev/null || true &
2827
docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &>/dev/null || true &
2928
docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &>/dev/null || true &

test/smoke-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ deploy_sourcegraph() {
1212
if [[ "$TEST_TYPE" == "pure-docker-test" ]]; then
1313
./test/volume-config.sh
1414
timeout 600s ./pure-docker/deploy.sh
15-
expect_containers="25"
15+
expect_containers="24"
1616
elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
1717
docker-compose --file docker-compose/docker-compose.yaml up -d -t 600
18-
expect_containers="27"
18+
expect_containers="26"
1919
fi
2020

2121
echo "Giving containers 90s to start..."

test/volume-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ echo
1818
echo "forcing static permissions on volume directories"
1919
echo
2020
pushd ~/sourcegraph-docker
21-
chown -R 100:101 gitserver* prometheus-v2* worker* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk
21+
chown -R 100:101 gitserver* prometheus-v2* worker* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk
2222
chown -R 999:1000 redis-store-disk redis-cache-disk
2323
chown -R 472:472 grafana-disk
2424
chown -R 999:999 pgsql-disk codeintel-db-disk

0 commit comments

Comments
 (0)