Adjust Bitnami Kafka image and use Kraft in E2E (#303)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bf1597..87ff06f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
## Change Logs
-### 1.1.0
+### 1.0.1
- Feature:
- - Add a new workflow to push docker images for arm64 and amd64
+ - Add a new workflow to push docker images for arm64 and amd64 (#297)
- Fixes:
- - Fix sw8 loss when use aiohttp.(#299,issue#10669)
- - Fix the bug with high cpu usage.(#300,issue#10672)
+ - Fix sw8 loss when use aiohttp (#299, issue#10669)
+ - **Critical**: Fix a bug that leads to high cpu usage (#300, issue#10672)
+
+- Others:
+ - Use Kraft mode in E2E Kafka reporter tests (#303)
### 1.0.0
diff --git a/tests/e2e/base/docker-compose.base.yml b/tests/e2e/base/docker-compose.base.yml
index 62b4aef..62a3f25 100644
--- a/tests/e2e/base/docker-compose.base.yml
+++ b/tests/e2e/base/docker-compose.base.yml
@@ -118,33 +118,19 @@
retries: 120
command: [ "run", "python3", "flask_consumer.py" ]
- # used by Kafka reporter e2e tests
- zookeeper:
- image: docker.io/bitnami/zookeeper:3.8
- hostname: zookeeper
- expose:
- - 2181
- networks:
- - e2e
- environment:
- - ALLOW_ANONYMOUS_LOGIN=yes
- healthcheck:
- test: [ "CMD", "sh", "-c", "nc -nz 127.0.0.1 2181" ]
- interval: 5s
- timeout: 60s
- retries: 120
-
broker-a:
- image: docker.io/bitnami/kafka:3.3
+ image: docker.io/bitnami/kafka:3.4
hostname: broker-a
expose:
- 9092
networks:
- e2e
environment:
- - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- - KAFKA_BROKER_ID=10
+ - BITNAMI_DEBUG=yes
- ALLOW_PLAINTEXT_LISTENER=yes
+ - KAFKA_CFG_NODE_ID=0
+ - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@broker-a:9093,1@broker-b:9093
+ - KAFKA_KRAFT_CLUSTER_ID=abcdefghijklmnopqrstuv
healthcheck:
test: [ "CMD", "kafka-topics.sh", "--list", "--bootstrap-server", "broker-a:9092" ]
interval: 5s
@@ -152,16 +138,18 @@
retries: 120
broker-b:
- image: docker.io/bitnami/kafka:3.3
+ image: docker.io/bitnami/kafka:3.4
hostname: broker-b
expose:
- 9092
networks:
- e2e
environment:
- - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
- - KAFKA_BROKER_ID=24
+ - BITNAMI_DEBUG=yes
- ALLOW_PLAINTEXT_LISTENER=yes
+ - KAFKA_CFG_NODE_ID=1
+ - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@broker-a:9093,1@broker-b:9093
+ - KAFKA_KRAFT_CLUSTER_ID=abcdefghijklmnopqrstuv
healthcheck:
test: [ "CMD", "kafka-topics.sh", "--list", "--bootstrap-server", "broker-b:9092" ]
interval: 5s
diff --git a/tests/e2e/case/kafka/gunicorn/docker-compose.kafka.gunicorn.yaml b/tests/e2e/case/kafka/gunicorn/docker-compose.kafka.gunicorn.yaml
index 9a97ac8..654e0aa 100644
--- a/tests/e2e/case/kafka/gunicorn/docker-compose.kafka.gunicorn.yaml
+++ b/tests/e2e/case/kafka/gunicorn/docker-compose.kafka.gunicorn.yaml
@@ -17,11 +17,6 @@
services:
- zookeeper:
- extends:
- file: ../../../base/docker-compose.base.yml
- service: zookeeper
-
broker-a:
extends:
file: ../../../base/docker-compose.base.yml
diff --git a/tests/e2e/case/kafka/single/docker-compose.kafka.single.yaml b/tests/e2e/case/kafka/single/docker-compose.kafka.single.yaml
index fcd79fc..1667f82 100644
--- a/tests/e2e/case/kafka/single/docker-compose.kafka.single.yaml
+++ b/tests/e2e/case/kafka/single/docker-compose.kafka.single.yaml
@@ -17,11 +17,6 @@
services:
- zookeeper:
- extends:
- file: ../../../base/docker-compose.base.yml
- service: zookeeper
-
broker-a:
extends:
file: ../../../base/docker-compose.base.yml
diff --git a/tests/e2e/case/kafka/uwsgi/docker-compose.kafka.uwsgi.yaml b/tests/e2e/case/kafka/uwsgi/docker-compose.kafka.uwsgi.yaml
index 63cd4c4..7471140 100644
--- a/tests/e2e/case/kafka/uwsgi/docker-compose.kafka.uwsgi.yaml
+++ b/tests/e2e/case/kafka/uwsgi/docker-compose.kafka.uwsgi.yaml
@@ -17,11 +17,6 @@
services:
- zookeeper:
- extends:
- file: ../../../base/docker-compose.base.yml
- service: zookeeper
-
broker-a:
extends:
file: ../../../base/docker-compose.base.yml
