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
getsentry · Aug 12, 2024 · 534a874 · 534a874
1 parent 053f401
commit 534a874
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 118 deletions.
diff --git a/.env b/.env
@@ -11,7 +11,6 @@ SNUBA_IMAGE=getsentry/snuba:nightly
 RELAY_IMAGE=getsentry/relay:nightly
 SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
 VROOM_IMAGE=getsentry/vroom:nightly
-WAL2JSON_VERSION=latest
 HEALTHCHECK_INTERVAL=30s
 HEALTHCHECK_TIMEOUT=1m30s
 HEALTHCHECK_RETRIES=10

diff --git a/.gitignore b/.gitignore
@@ -98,9 +98,6 @@ geoip/GeoIP.conf
 geoip/*.mmdb
 geoip/.geoipupdate.lock
 
-# wal2json download
-postgres/wal2json
-
 # integration testing
 _integration-test/custom-ca-roots/nginx/*
 sentry/test-custom-ca-roots.py

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -126,23 +126,12 @@ services:
       [
         "postgres",
         "-c",
-        "wal_level=logical",
-        "-c",
-        "max_replication_slots=1",
-        "-c",
-        "max_wal_senders=1",
-        "-c",
         "max_connections=${POSTGRES_MAX_CONNECTIONS:-100}",
       ]
     environment:
       POSTGRES_HOST_AUTH_METHOD: "trust"
-    entrypoint: /opt/sentry/postgres-entrypoint.sh
     volumes:
       - "sentry-postgres:/var/lib/postgresql/data"
-      - type: bind
-        read_only: true
-        source: ./postgres/
-        target: /opt/sentry/
   zookeeper:
     <<: *restart_policy
     image: "confluentinc/cp-zookeeper:7.6.1"

diff --git a/install.sh b/install.sh
@@ -32,7 +32,6 @@ source install/ensure-relay-credentials.sh
 source install/generate-secret-key.sh
 source install/update-docker-images.sh
 source install/build-docker-images.sh
-source install/install-wal2json.sh
 source install/bootstrap-snuba.sh
 source install/upgrade-postgres.sh
 source install/set-up-and-migrate-database.sh

diff --git a/install/install-wal2json.sh b/install/install-wal2json.sh
diff --git a/postgres/init_hba.sh b/postgres/init_hba.sh
diff --git a/postgres/postgres-entrypoint.sh b/postgres/postgres-entrypoint.sh
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
@@ -4,11 +4,7 @@ set -eu
 OLD_VERSION="$1"
 NEW_VERSION="$2"
 
-WAL2JSON_VERSION=${WAL2JSON_VERSION:-$(curl -s "https://api.github.com/repos/getsentry/wal2json/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")')}
-
-sed -i -e "s/^WAL2JSON_VERSION=\([^:]\+\):.\+\$/WAL2JSON_VERSION=\1:$WAL2JSON_VERSION/" .env
 sed -i -e "s/^\(SENTRY\|SNUBA\|RELAY\|SYMBOLICATOR\|VROOM\)_IMAGE=\([^:]\+\):.\+\$/\1_IMAGE=\2:$NEW_VERSION/" .env
 sed -i -e "s/^\# Self-Hosted Sentry .*/# Self-Hosted Sentry $NEW_VERSION/" README.md
 
 echo "New version: $NEW_VERSION"
-echo "New wal2json version: $WAL2JSON_VERSION"