Merge pull request #10 from equinor/upgradeKafka

Upgrade kafka
equinor · Nov 7, 2024 · 20676ee · 20676ee
2 parents 9bf66bd + de1acf4
commit 20676ee
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 31 deletions.
diff --git a/dependson-services/.env b/dependson-services/.env
@@ -1,3 +1,3 @@
 STREAMINITIATOR_VERSION=1.6.63
-CONFLUENT_VERSION=7.5.4
+CONFLUENT_VERSION=7.7.1
 
diff --git a/dependson-services/compose-kafka.yml b/dependson-services/compose-kafka.yml
@@ -2,54 +2,48 @@
 version: '3.7'
 services:
 
-  zookeeper:
-    image: confluentinc/cp-zookeeper:${CONFLUENT_VERSION}
-    hostname: zookeeper
-    ports:
-      - "2181:2181"
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    networks:
-      - local-network
-
-  broker_ingress:
+  broker:
     image: confluentinc/cp-kafka:${CONFLUENT_VERSION}
-    hostname: broker_ingress
-    depends_on:
-      - zookeeper
+    hostname: broker
     ports:
       - "29092:29092"
       - "9092:9092"
+      - "9101:9101"
     environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181/ingress'
-      KAKFA_BOOTSTRAP_SERVERS: broker_ingress:29092
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://broker:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_JMX_PORT: 9101
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@broker:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://broker:29092,CONTROLLER://broker:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'false'
       KAFKA_ALLOW_AUTO_CREATE_TOPICS: 'false'
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://broker_ingress:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
       KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
-      KAKFA_SOCKET_SEND.BUFFER.BYTES: 102400
-      KAKFA_NUM_IO_THREADS: 2
-      KAKFA_NUM_NETWORK_THREADS: 2
+      KAFKA_SOCKET_SEND_BUFFER_BYTES: 102400  
+      KAFKA_NUM_IO_THREADS: 2
+      KAFKA_NUM_NETWORK_THREADS: 2
       KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE: 'false'
-      KAFKA_HEAP_OPTS: -Xmx256m -Xms256m
+      KAFKA_HEAP_OPTS: '-Xmx256m -Xms256m'
+      CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'  
     networks:
       - local-network
 
+
   schemaregistry:
     image: confluentinc/cp-schema-registry:${CONFLUENT_VERSION}
     hostname: schemaregistry
     depends_on:
-      - zookeeper
-      - broker_ingress
+      - broker
     ports:
       - "8081:8081"
     environment:
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: 'broker_ingress:29092'
+      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: 'broker:29092'
     networks:
       - local-network
 
@@ -61,8 +55,8 @@ services:
     environment:
       ZOOKEEPERS: zookeeper:2181
       SERVER_PORT: 8080
-      BROKERS_COLD: broker_ingress:29092
-      BROKERS_INGRESS: broker_ingress:29092
+      BROKERS_COLD: broker:29092
+      BROKERS_INGRESS: broker:29092
       SCHEMAREGISTRY: http://schemaregistry:8081
       REPLICATION_FACTOR: 1
       SPRING_PROFILES_ACTIVE: docker