rebase

FundingCircle · Mar 16, 2024 · 0aba11d · 0aba11d
1 parent e7cfa6d
commit 0aba11d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/run_checks.yaml b/.github/workflows/run_checks.yaml
@@ -11,35 +11,34 @@ jobs:
       options: --user 1001 # don't run as root
     services:
       kafka:
-        image: confluentinc/cp-kafka:5.1.3
+        image: apache/kafka:3.7.0
         env:
+          CLUSTER_ID: 8L6g2nShT-eMCtK--X46sw
           KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092
           KAFKA_AUTO_CREATE_TOPICS_ENABLE: true
           KAFKA_BROKER_ID: 1
-          KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-          KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-          KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+          KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+          KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:29093
           KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
-          KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+          KAFKA_LISTENERS: CONTROLLER://:29093,PLAINTEXT://:9092
+          KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+          KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+          KAFKA_PROCESS_ROLES: broker,controller
           KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+          KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
       schema-registry:
-        image: confluentinc/cp-schema-registry:5.1.2
+        image: confluentinc/cp-schema-registry:7.6.0
         env:
           SCHEMA_REGISTRY_HOST_NAME: schema-registry
-          SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: 'zookeeper:2181'
+          SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
+          SCHEMA_REGISTRY_LISTENERS: http://schema-registry:8081
       kafka-rest:
-        image: confluentinc/cp-kafka-rest:6.1.1
+        image: confluentinc/cp-kafka-rest:7.6.0
         env:
-          KAFKA_REST_ZOOKEEPER_CONNECT: zookeeper:2181
           KAFKA_REST_BOOTSTRAP_SERVERS: kafka:9092
-          KAFKA_REST_LISTENERS: http://0.0.0.0:8082
-          KAFKA_REST_SCHEMA_REGISTRY: http://schema-registry:8081
           KAFKA_REST_HOST_NAME: kafka-rest
-      zookeeper:
-        image: confluentinc/cp-zookeeper:5.1.3
-        env: 
-          ZOOKEEPER_CLIENT_PORT: 2181
-          ZOOKEEPER_TICK_TIME: 2000
+          KAFKA_REST_LISTENERS: http://0.0.0.0:8082
+          KAFKA_REST_SCHEMA_REGISTRY_URL: http://schema-registry:8081
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -52,7 +51,6 @@ jobs:
           lein kaocha
         env: 
           KAFKA_BOOTSTRAP_SERVERS: kafka
-          ZOOKEEPER_HOST: zoopkeeper
           SCHEMA_REGISTRY_HOST: schema-registry
           KAFKA_REST_PROXY_HOST: kafka-rest
       - name: lint

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,7 +26,6 @@ services:
       KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
       KAFKA_JMX_PORT: 9101
       KAFKA_JMX_HOSTNAME: localhost
-      KAFKA_CONFLUENT_SCHEMA_REGISTRY_URL: http://schema-registry:8081
     healthcheck:
       test: ["CMD", "/opt/kafka/bin/kafka-topics.sh", "--bootstrap-server", "broker:29092", "--list"]
       interval: 5s