From a2ed20bd61389f5789d14b8ba75d2f3af4b016d9 Mon Sep 17 00:00:00 2001 From: anthony sottile Date: Mon, 12 Jun 2023 12:24:53 -0400 Subject: [PATCH] ref: use kafka from devservices directly --- .github/actions/setup-sentry/action.yml | 28 ++----------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/.github/actions/setup-sentry/action.yml b/.github/actions/setup-sentry/action.yml index e34f7790c71af7..a9623166c6c54b 100644 --- a/.github/actions/setup-sentry/action.yml +++ b/.github/actions/setup-sentry/action.yml @@ -167,35 +167,11 @@ runs: services="${services} chartcuterie" fi - sentry devservices up $services & - - # TODO: Use devservices kafka. See https://github.com/getsentry/sentry/pull/20986#issuecomment-704510570 if [ "$NEED_KAFKA" = "true" ]; then - # This is *not* the production version. Unclear reason as to why this was chosen - # https://github.com/getsentry/ops/blob/c823e62f930ecc6c97bb08898c71e49edc7232f6/cookbooks/getsentry/attributes/default.rb#L631 - docker run \ - --name sentry_zookeeper \ - -d --network host \ - -e ZOOKEEPER_CLIENT_PORT=2181 \ - confluentinc/cp-zookeeper:4.1.0 \ - & - - # This is the production version; do not change w/o changing it there as well - # https://github.com/getsentry/ops/blob/c823e62f930ecc6c97bb08898c71e49edc7232f6/cookbooks/getsentry/attributes/default.rb#L643 - docker run \ - --name sentry_kafka \ - -d --network host \ - -e KAFKA_ZOOKEEPER_CONNECT=127.0.0.1:2181 \ - -e KAFKA_LISTENERS=INTERNAL://0.0.0.0:9093,EXTERNAL://0.0.0.0:9092 \ - -e KAFKA_ADVERTISED_LISTENERS=INTERNAL://127.0.0.1:9093,EXTERNAL://127.0.0.1:9092 \ - -e KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT \ - -e KAFKA_INTER_BROKER_LISTENER_NAME=INTERNAL \ - -e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \ - confluentinc/cp-kafka:5.1.2 \ - & + services="${services} kafka zookeeper" fi - wait + sentry devservices up $services docker ps -a