Skip to content

Commit 534a874

Browse files
authored
Remove cdc and wal2json and use the default postgres entrypoint (#3260)
* Remove cdc and wal2json and use the default postgres entrypoint * Remove the last bits of wal2json install * Remove read-only postgres volume bind
1 parent 053f401 commit 534a874

File tree

8 files changed

+0
-118
lines changed

8 files changed

+0
-118
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SNUBA_IMAGE=getsentry/snuba:nightly
1111
RELAY_IMAGE=getsentry/relay:nightly
1212
SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
1313
VROOM_IMAGE=getsentry/vroom:nightly
14-
WAL2JSON_VERSION=latest
1514
HEALTHCHECK_INTERVAL=30s
1615
HEALTHCHECK_TIMEOUT=1m30s
1716
HEALTHCHECK_RETRIES=10

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ geoip/GeoIP.conf
9898
geoip/*.mmdb
9999
geoip/.geoipupdate.lock
100100

101-
# wal2json download
102-
postgres/wal2json
103-
104101
# integration testing
105102
_integration-test/custom-ca-roots/nginx/*
106103
sentry/test-custom-ca-roots.py

docker-compose.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,12 @@ services:
126126
[
127127
"postgres",
128128
"-c",
129-
"wal_level=logical",
130-
"-c",
131-
"max_replication_slots=1",
132-
"-c",
133-
"max_wal_senders=1",
134-
"-c",
135129
"max_connections=${POSTGRES_MAX_CONNECTIONS:-100}",
136130
]
137131
environment:
138132
POSTGRES_HOST_AUTH_METHOD: "trust"
139-
entrypoint: /opt/sentry/postgres-entrypoint.sh
140133
volumes:
141134
- "sentry-postgres:/var/lib/postgresql/data"
142-
- type: bind
143-
read_only: true
144-
source: ./postgres/
145-
target: /opt/sentry/
146135
zookeeper:
147136
<<: *restart_policy
148137
image: "confluentinc/cp-zookeeper:7.6.1"

install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ source install/ensure-relay-credentials.sh
3232
source install/generate-secret-key.sh
3333
source install/update-docker-images.sh
3434
source install/build-docker-images.sh
35-
source install/install-wal2json.sh
3635
source install/bootstrap-snuba.sh
3736
source install/upgrade-postgres.sh
3837
source install/set-up-and-migrate-database.sh

install/install-wal2json.sh

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

postgres/init_hba.sh

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

postgres/postgres-entrypoint.sh

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

scripts/bump-version.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ set -eu
44
OLD_VERSION="$1"
55
NEW_VERSION="$2"
66

7-
WAL2JSON_VERSION=${WAL2JSON_VERSION:-$(curl -s "https://api.github.com/repos/getsentry/wal2json/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")')}
8-
9-
sed -i -e "s/^WAL2JSON_VERSION=\([^:]\+\):.\+\$/WAL2JSON_VERSION=\1:$WAL2JSON_VERSION/" .env
107
sed -i -e "s/^\(SENTRY\|SNUBA\|RELAY\|SYMBOLICATOR\|VROOM\)_IMAGE=\([^:]\+\):.\+\$/\1_IMAGE=\2:$NEW_VERSION/" .env
118
sed -i -e "s/^\# Self-Hosted Sentry .*/# Self-Hosted Sentry $NEW_VERSION/" README.md
129

1310
echo "New version: $NEW_VERSION"
14-
echo "New wal2json version: $WAL2JSON_VERSION"

0 commit comments

Comments
 (0)