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.

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

feat(quickstart): Remove kafka-setup as a hard deployment requirement #7073

Merged
merged 30 commits into from
Jan 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
86879ee
feat(quickstart): Remove kafka-setup as a hard deployment requirement
pedro93 Jan 18, 2023
7927b81
Update quickstart
pedro93 Jan 19, 2023
4e66f42
Fix mce env vars
pedro93 Jan 19, 2023
e8fd760
more fixes
pedro93 Jan 19, 2023
b8d3c77
Fix list merging
pedro93 Jan 19, 2023
959de38
Dedup env vars & make neo4j consumers consistent
pedro93 Jan 19, 2023
733d586
change mae consumer env var file
pedro93 Jan 19, 2023
2d71155
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 19, 2023
91ae779
Fix compose check logic, adds neo4j supported m1 docker-compose
pedro93 Jan 19, 2023
a6469f9
Add support for Neo4J M1 quickstart
pedro93 Jan 19, 2023
bcc1c54
Remove temp files
pedro93 Jan 19, 2023
b3eba22
Fix docker cli linting issues
pedro93 Jan 19, 2023
b18672a
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 19, 2023
19d3b26
Correct url
pedro93 Jan 19, 2023
a905b21
remove old code
pedro93 Jan 19, 2023
c8d35db
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 19, 2023
a8118ff
Fix cyclomatic complexity of docker method
pedro93 Jan 19, 2023
52ed268
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 20, 2023
4dc6332
Use YQ installation Github Action
pedro93 Jan 20, 2023
4af8370
Specify yq version to install
pedro93 Jan 20, 2023
7f85331
Fix action version
pedro93 Jan 20, 2023
3b15857
bump to latest action version
pedro93 Jan 20, 2023
7c50481
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 20, 2023
566760d
Fix bug in docker cli python file
pedro93 Jan 20, 2023
ac1ad8e
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 21, 2023
7572727
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 23, 2023
3003b52
Update docker images to use kafka 7.2.2
pedro93 Jan 23, 2023
4feb4a0
Merge branch 'master' into remove-kafka-setup-from-cli
pedro93 Jan 23, 2023
c8a4602
Remove kymeric reference
pedro93 Jan 23, 2023
23b6f91
Bump confluent to 7.2.2
pedro93 Jan 24, 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
4 changes: 4 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: "3.7"
- name: Download YQ
uses: chrisdickinson/[email protected]
with:
yq-version: v4.28.2
- name: Quickstart Compose Validation
run: ./docker/quickstart/generate_and_compare.sh

Expand Down
6 changes: 5 additions & 1 deletion docker/datahub-mce-consumer/env/docker.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MCE_CONSUMER_ENABLED=true
EBEAN_DATASOURCE_USERNAME=datahub
EBEAN_DATASOURCE_PASSWORD=datahub
EBEAN_DATASOURCE_HOST=mysql:3306
EBEAN_DATASOURCE_URL=jdbc:mysql://mysql:3306/datahub?verifyServerCertificate=false&useSSL=true&useUnicode=yes&characterEncoding=UTF-8
EBEAN_DATASOURCE_URL=jdbc:mysql://mysql:3306/datahub?verifyServerCertificate=false&useSSL=true&useUnicode=yes&characterEncoding=UTF-8&enabledTLSProtocols=TLSv1.2
EBEAN_DATASOURCE_DRIVER=com.mysql.jdbc.Driver
KAFKA_BOOTSTRAP_SERVER=broker:29092
KAFKA_SCHEMAREGISTRY_URL=http://schema-registry:8081
Expand All @@ -15,6 +15,10 @@ JAVA_OPTS=-Xms1g -Xmx1g
ENTITY_REGISTRY_CONFIG_PATH=/datahub/datahub-mce-consumer/resources/entity-registry.yml
DATAHUB_SYSTEM_CLIENT_ID=__datahub_system
DATAHUB_SYSTEM_CLIENT_SECRET=JohnSnowKnowsNothing
ENTITY_SERVICE_ENABLE_RETENTION=true
MAE_CONSUMER_ENABLED=false
PE_CONSUMER_ENABLED=false
UI_INGESTION_ENABLED=false

# Uncomment to configure kafka topic names
# Make sure these names are consistent across the whole deployment
Expand Down
19 changes: 3 additions & 16 deletions docker/docker-compose-with-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version: '3.8'
services:
zookeeper:
image: confluentinc/cp-zookeeper:5.4.0
image: confluentinc/cp-zookeeper:7.2.2
env_file: zookeeper/env/docker.env
hostname: zookeeper
container_name: zookeeper
Expand All @@ -17,7 +17,7 @@ services:
- zkdata:/var/lib/zookeeper

broker:
image: confluentinc/cp-kafka:5.4.0
image: confluentinc/cp-kafka:7.2.2
env_file: broker/env/docker.env
hostname: broker
container_name: broker
Expand All @@ -29,25 +29,12 @@ services:
volumes:
- broker:/var/lib/kafka/data/

# This "container" is a workaround to pre-create topics
kafka-setup:
build:
context: kafka-setup
image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
env_file: kafka-setup/env/docker.env
hostname: kafka-setup
container_name: kafka-setup
depends_on:
- broker
- schema-registry

schema-registry:
image: confluentinc/cp-schema-registry:5.4.0
image: confluentinc/cp-schema-registry:7.2.2
env_file: schema-registry/env/docker.env
hostname: schema-registry
container_name: schema-registry
depends_on:
- zookeeper
- broker
ports:
- "8081:8081"
Expand Down
6 changes: 0 additions & 6 deletions docker/docker-compose-without-neo4j.m1.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
services:
broker:
image: kymeric/cp-kafka:latest
mysql:
image: mariadb:10.5.8
schema-registry:
image: eugenetea/schema-registry-arm64:latest
zookeeper:
image: kymeric/cp-zookeeper:latest
2 changes: 1 addition & 1 deletion docker/docker-compose-without-neo4j.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
hostname: mysql
image: mysql:5.7
env_file: mysql/env/docker.env
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
volumes:
Expand Down
19 changes: 3 additions & 16 deletions docker/docker-compose-without-neo4j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version: '3.8'
services:
zookeeper:
image: confluentinc/cp-zookeeper:5.4.0
image: confluentinc/cp-zookeeper:7.2.2
env_file: zookeeper/env/docker.env
hostname: zookeeper
container_name: zookeeper
Expand All @@ -17,7 +17,7 @@ services:
- zkdata:/var/lib/zookeeper

broker:
image: confluentinc/cp-kafka:5.4.0
image: confluentinc/cp-kafka:7.2.2
env_file: broker/env/docker.env
hostname: broker
container_name: broker
Expand All @@ -26,25 +26,12 @@ services:
ports:
- ${DATAHUB_MAPPED_KAFKA_BROKER_PORT:-9092}:9092

# This "container" is a workaround to pre-create topics
kafka-setup:
build:
context: kafka-setup
image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
env_file: kafka-setup/env/docker.env
hostname: kafka-setup
container_name: kafka-setup
depends_on:
- broker
- schema-registry

schema-registry:
image: confluentinc/cp-schema-registry:5.4.0
image: confluentinc/cp-schema-registry:7.2.2
env_file: schema-registry/env/docker.env
hostname: schema-registry
container_name: schema-registry
depends_on:
- zookeeper
- broker
ports:
- ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
Expand Down
3 changes: 3 additions & 0 deletions docker/docker-compose.consumers-without-neo4j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,8 @@ services:
env_file: datahub-mce-consumer/env/docker.env
hostname: datahub-mce-consumer
container_name: datahub-mce-consumer
environment:
- DATAHUB_SERVER_TYPE=${DATAHUB_SERVER_TYPE:-quickstart}
- DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
ports:
- "9090:9090"
10 changes: 10 additions & 0 deletions docker/docker-compose.consumers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,15 @@ services:
env_file: datahub-mce-consumer/env/docker.env
hostname: datahub-mce-consumer
container_name: datahub-mce-consumer
environment:
- DATAHUB_SERVER_TYPE=${DATAHUB_SERVER_TYPE:-quickstart}
- DATAHUB_TELEMETRY_ENABLED=${DATAHUB_TELEMETRY_ENABLED:-true}
- NEO4J_HOST=http://neo4j:7474
- NEO4J_URI=bolt://neo4j
- NEO4J_USERNAME=neo4j
- NEO4J_PASSWORD=datahub
- GRAPH_SERVICE_IMPL=neo4j
ports:
- "9090:9090"
depends_on:
- neo4j
11 changes: 0 additions & 11 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,6 @@ services:
- ./elasticsearch-setup/create-indices.sh:/create-indices.sh
- ../metadata-service/restli-servlet-impl/src/main/resources/index/:/index

kafka-setup:
image: linkedin/datahub-kafka-setup:debug
build:
context: ../
dockerfile: ./docker/kafka-setup/Dockerfile
args:
APP_ENV: dev
depends_on:
- broker
- schema-registry

datahub-gms:
image: linkedin/datahub-gms:debug
build:
Expand Down
15 changes: 15 additions & 0 deletions docker/docker-compose.kafka-setup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Service definitions for Kafka Setup container.
version: '3.8'
services:

# This "container" is a workaround to pre-create topics
kafka-setup:
build:
context: kafka-setup
image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
env_file: kafka-setup/env/docker.env
hostname: kafka-setup
container_name: kafka-setup
depends_on:
- broker
- schema-registry
6 changes: 0 additions & 6 deletions docker/docker-compose.m1.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
services:
broker:
image: kymeric/cp-kafka:latest
mysql:
image: mariadb:10.5.8
schema-registry:
image: eugenetea/schema-registry-arm64:latest
zookeeper:
image: kymeric/cp-zookeeper:latest
neo4j:
image: neo4j/neo4j-arm64-experimental:4.0.6-arm64
2 changes: 1 addition & 1 deletion docker/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
hostname: mysql
image: mysql:5.7
env_file: mysql/env/docker.env
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: '3.8'
services:
kafka-rest-proxy:
image: confluentinc/cp-kafka-rest:5.4.0
image: confluentinc/cp-kafka-rest:7.2.2
env_file: kafka-rest-proxy/env/docker.env
hostname: kafka-rest-proxy
container_name: kafka-rest-proxy
Expand Down
20 changes: 3 additions & 17 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version: '3.8'
services:
zookeeper:
image: confluentinc/cp-zookeeper:5.4.0
image: confluentinc/cp-zookeeper:7.2.2
env_file: zookeeper/env/docker.env
hostname: zookeeper
container_name: zookeeper
Expand All @@ -17,7 +17,7 @@ services:
- zkdata:/var/lib/zookeeper

broker:
image: confluentinc/cp-kafka:5.4.0
image: confluentinc/cp-kafka:7.2.2
env_file: broker/env/docker.env
hostname: broker
container_name: broker
Expand All @@ -28,26 +28,12 @@ services:
volumes:
- broker:/var/lib/kafka/data/

# This "container" is a workaround to pre-create topics
kafka-setup:
build:
dockerfile: ./docker/kafka-setup/Dockerfile
context: ../
image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
env_file: kafka-setup/env/docker.env
hostname: kafka-setup
container_name: kafka-setup
depends_on:
- broker
- schema-registry

schema-registry:
image: confluentinc/cp-schema-registry:5.4.0
image: confluentinc/cp-schema-registry:7.2.2
env_file: schema-registry/env/docker.env
hostname: schema-registry
container_name: schema-registry
depends_on:
- zookeeper
- broker
ports:
- ${DATAHUB_MAPPED_SCHEMA_REGISTRY_PORT:-8081}:8081
Expand Down
Loading