Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Kafka version to 3.x #1835

Closed
wants to merge 9 commits into from
Closed

Bump Kafka version to 3.x #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
64637a9
Bump Kafka version to 3.x
dominikriemer Aug 20, 2023
3df5140
Improve Kafka behaviour for pipeline preview (#1838)
dominikriemer Aug 22, 2023
a4d1e13
Merge branch 'dev' into migrate-kafka-3
dominikriemer Aug 22, 2023
0ea74c9
Remove zookeeper references from Kafka settings
dominikriemer Aug 23, 2023
854ed4a
Merge branch 'migrate-kafka-3' of github.com:apache/streampipes into …
dominikriemer Aug 23, 2023
5734592
Delay startup of adapters
dominikriemer Aug 23, 2023
c491520
Merge branch 'dev' into migrate-kafka-3
dominikriemer Sep 10, 2023
1d9ff9b
Merge branch 'dev' into migrate-kafka-3
dominikriemer Sep 17, 2023
ceef297
Fix import
dominikriemer Sep 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,30 +113,23 @@ services:
spnet:

kafka:
image: fogsyio/kafka:2.2.0
hostname: kafka
depends_on:
- zookeeper
image: bitnami/kafka:3.5.1
environment:
# see: https://github.com/confluentinc/schema-registry/issues/648
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092
KAFKA_LISTENERS: PLAINTEXT://:9092
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
- KAFKA_CFG_NODE_ID=0
- KAFKA_CFG_PROCESS_ROLES=controller,broker
- KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
- KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,OUTSIDE://:9094
- KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,OUTSIDE://localhost:9094
- KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT
- KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
- KAFKA_CFG_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_FETCH_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_REPLICA_FETCH_MAX_BYTES=10000000
- KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
volumes:
- kafka:/kafka
- /var/run/docker.sock:/var/run/docker.sock
- kafka3:/bitnami
logging: *default-logging
networks:
spnet:

zookeeper:
image: fogsyio/zookeeper:3.4.13
logging: *default-logging
volumes:
- zookeeper:/opt/zookeeper-3.4.13
restart: unless-stopped
networks:
spnet:

Expand All @@ -160,11 +153,10 @@ services:
spnet:

volumes:
kafka:
kafka3:
files:
consul:
couchdb:
zookeeper:
influxdb:
influxdb2:
backend:
Expand Down
27 changes: 15 additions & 12 deletions installer/cli/deploy/standalone/kafka/docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,20 @@ version: "3.4"
services:
kafka:
ports:
- "9093:9093"
- "9092:9092"
- "9094:9094"
depends_on:
- zookeeper
environment:
# see: https://github.com/confluentinc/schema-registry/issues/648
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092,OUTSIDE://localhost:9094 #(local, i.e. Single-Node with IDE + Docker)
KAFKA_LISTENERS: PLAINTEXT://:9092,OUTSIDE://:9094
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_MESSAGE_MAX_BYTES: 5000012
KAFKA_FETCH_MESSAGE_MAX_BYTES: 5000012
KAFKA_REPLICA_FETCH_MAX_BYTES: 10000000
# KRaft settings
- KAFKA_CFG_NODE_ID=0
- KAFKA_CFG_PROCESS_ROLES=controller,broker
- KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
# Listeners
- KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,OUTSIDE://:9094
- KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,OUTSIDE://localhost:9094
- KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT
- KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
- KAFKA_CFG_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_FETCH_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_REPLICA_FETCH_MAX_BYTES=10000000
- KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
32 changes: 16 additions & 16 deletions installer/cli/deploy/standalone/kafka/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@
version: "3.4"
services:
kafka:
image: fogsyio/kafka:2.2.0
image: bitnami/kafka:3.5.1
hostname: kafka
depends_on:
- zookeeper
environment:
# see: https://github.com/confluentinc/schema-registry/issues/648
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092
KAFKA_LISTENERS: PLAINTEXT://:9092
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_MESSAGE_MAX_BYTES: 5000012
KAFKA_FETCH_MESSAGE_MAX_BYTES: 5000012
KAFKA_REPLICA_FETCH_MAX_BYTES: 10000000
# KRaft settings
- KAFKA_CFG_NODE_ID=0
- KAFKA_CFG_PROCESS_ROLES=controller,broker
- KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
# Listeners
- KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
- KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://:9092
- KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
- KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
- KAFKA_CFG_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_FETCH_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_REPLICA_FETCH_MAX_BYTES=10000000
- KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
volumes:
- kafka:/kafka
- /var/run/docker.sock:/var/run/docker.sock
- kafka3:/bitnami
logging:
driver: "json-file"
options:
Expand All @@ -43,7 +43,7 @@ services:
spnet:

volumes:
kafka:
kafka3:

networks:
spnet:
Expand Down
51 changes: 14 additions & 37 deletions installer/compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,32 +91,21 @@ services:
spnet:

kafka:
image: fogsyio/kafka:2.2.0
hostname: kafka
depends_on:
- zookeeper
image: bitnami/kafka:3.5.1
environment:
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092
KAFKA_LISTENERS: PLAINTEXT://:9092
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_MESSAGE_MAX_BYTES: 5000012
KAFKA_FETCH_MESSAGE_MAX_BYTES: 5000012
KAFKA_REPLICA_FETCH_MAX_BYTES: 10000000
volumes:
- kafka:/kafka
- /var/run/docker.sock:/var/run/docker.sock
logging: *default-logging
restart: unless-stopped
networks:
spnet:

zookeeper:
image: fogsyio/zookeeper:3.4.13
- KAFKA_CFG_NODE_ID=0
- KAFKA_CFG_PROCESS_ROLES=controller,broker
- KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
- KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,OUTSIDE://:9094
- KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,OUTSIDE://localhost:9094
- KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,OUTSIDE:PLAINTEXT
- KAFKA_CFG_INTER_BROKER_LISTENER_NAME=PLAINTEXT
- KAFKA_CFG_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_FETCH_MESSAGE_MAX_BYTES=5000012
- KAFKA_CFG_REPLICA_FETCH_MAX_BYTES=10000000
- KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
volumes:
- zookeeper:/opt/zookeeper-3.4.13
- kafka3:/bitnami
logging: *default-logging
restart: unless-stopped
networks:
Expand Down Expand Up @@ -154,24 +143,12 @@ services:
networks:
spnet:

sources-watertank-simulator:
image: "${SP_DOCKER_REGISTRY}/sources-watertank-simulator:${SP_VERSION}"
depends_on:
- consul
- kafka
logging: *default-logging
restart: unless-stopped
networks:
spnet:


volumes:
backend:
consul:
connect:
couchdb:
kafka:
zookeeper:
kafka3:
influxdb:
influxdb2:
files:
Expand Down
14 changes: 0 additions & 14 deletions installer/k8s/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,20 +224,6 @@ rm -rf ${HOME}/streampipes-k8s
| external.kafka.persistence.pvName | Name of the Kafka PersistentVolume | "kafka-pv" |


####Zookeeper common parameters
| Parameter Name | Description | Value |
|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
| external.zookeeper.appName | ZooKeeper application name | "zookeeper" |
| external.zookeeper.version | ZooKeeper version | 3.4.13 |
| external.zookeeper.port | Port for the ZooKeeper service | 2181 |
| external.zookeeper.service.name | Name of the ZooKeeper service | "zookeeper" |
| external.zookeeper.service.port | TargetPort of the ZooKeeper service | 2181 |
| external.zookeeper.persistence.storageClassName | Storage class name for ZooKeeper PVs | "hostpath" |
| external.zookeeper.persistence.storageSize | Size of the ZooKeeper PV | "1Gi" |
| external.zookeeper.persistence.claimName | Name of the ZooKeeper PersistentVolumeClaim | "zookeeper-pvc" |
| external.zookeeper.persistence.pvName | Name of the ZooKeeper PersistentVolume | "zookeeper-pv" |


####Pulsar common parameters
| Parameter Name | Description | Value |
|-------------------------------------------------|----------------------------------------------------------|------------------------------------------|
Expand Down
74 changes: 0 additions & 74 deletions installer/k8s/templates/external/zookeeper/zookeeper-deployment.yaml
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions installer/k8s/templates/external/zookeeper/zookeeper-pvc.yaml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions installer/k8s/templates/external/zookeeper/zookeeper-service.yaml
View file
Open in desktop

This file was deleted.

Loading