quickstart: Adding UI ingestion to quickstart YAML (#3994)

datahub-project · Jan 27, 2022 · 35ebca7 · 35ebca7
1 parent 271784c
commit 35ebca7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 39 deletions.
diff --git a/docker/datahub-actions/default_actions.yaml b/docker/datahub-actions/default_actions.yaml
diff --git a/docker/datahub-actions/env/docker.env b/docker/datahub-actions/env/docker.env
@@ -6,8 +6,8 @@ METADATA_AUDIT_EVENT_NAME=MetadataAuditEvent_v4
 METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME=MetadataChangeLog_Versioned_v1
 
 # System Auth --
-DATAHUB_SYSTEM_CLIENT_ID:__datahub_system
-DATAHUB_SYSTEM_CLIENT_SECRET:JohnSnowKnowsNothing
+DATAHUB_SYSTEM_CLIENT_ID=__datahub_system
+DATAHUB_SYSTEM_CLIENT_SECRET=JohnSnowKnowsNothing
 
 # Kafka Authentication
 KAFKA_PROPERTIES_SECURITY_PROTOCOL=PLAINTEXT

diff --git a/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j-m1.quickstart.yml
@@ -19,6 +19,21 @@ services:
     ports:
     - 29092:29092
     - 9092:9092
+  datahub-actions:
+    depends_on:
+      - datahub-gms
+    environment:
+      - GMS_HOST=datahub-gms
+      - GMS_PORT=8080
+      - KAFKA_BOOTSTRAP_SERVER=broker:29092
+      - SCHEMA_REGISTRY_URL=http://schema-registry:8081
+      - METADATA_AUDIT_EVENT_NAME=MetadataAuditEvent_v4
+      - METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME=MetadataChangeLog_Versioned_v1
+      - DATAHUB_SYSTEM_CLIENT_ID=__datahub_system
+      - DATAHUB_SYSTEM_CLIENT_SECRET=JohnSnowKnowsNothing
+      - KAFKA_PROPERTIES_SECURITY_PROTOCOL=PLAINTEXT
+    hostname: actions
+    image: public.ecr.aws/datahub/acryl-datahub-actions:${ACTIONS_VERSION:-head}
   datahub-frontend-react:
     container_name: datahub-frontend-react
     depends_on:

diff --git a/docker/quickstart/docker-compose-without-neo4j.quickstart.yml b/docker/quickstart/docker-compose-without-neo4j.quickstart.yml
@@ -29,8 +29,8 @@ services:
     - SCHEMA_REGISTRY_URL=http://schema-registry:8081
     - METADATA_AUDIT_EVENT_NAME=MetadataAuditEvent_v4
     - METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME=MetadataChangeLog_Versioned_v1
-    - DATAHUB_SYSTEM_CLIENT_ID:__datahub_system=None
-    - DATAHUB_SYSTEM_CLIENT_SECRET:JohnSnowKnowsNothing=None
+    - DATAHUB_SYSTEM_CLIENT_ID=__datahub_system
+    - DATAHUB_SYSTEM_CLIENT_SECRET=JohnSnowKnowsNothing
     - KAFKA_PROPERTIES_SECURITY_PROTOCOL=PLAINTEXT
     hostname: actions
     image: public.ecr.aws/datahub/acryl-datahub-actions:${ACTIONS_VERSION:-head}

diff --git a/docker/quickstart/docker-compose.quickstart.yml b/docker/quickstart/docker-compose.quickstart.yml
@@ -29,8 +29,8 @@ services:
     - SCHEMA_REGISTRY_URL=http://schema-registry:8081
     - METADATA_AUDIT_EVENT_NAME=MetadataAuditEvent_v4
     - METADATA_CHANGE_LOG_VERSIONED_TOPIC_NAME=MetadataChangeLog_Versioned_v1
-    - DATAHUB_SYSTEM_CLIENT_ID:__datahub_system=None
-    - DATAHUB_SYSTEM_CLIENT_SECRET:JohnSnowKnowsNothing=None
+    - DATAHUB_SYSTEM_CLIENT_ID=__datahub_system
+    - DATAHUB_SYSTEM_CLIENT_SECRET=JohnSnowKnowsNothing
     - KAFKA_PROPERTIES_SECURITY_PROTOCOL=PLAINTEXT
     hostname: actions
     image: public.ecr.aws/datahub/acryl-datahub-actions:${ACTIONS_VERSION:-head}

diff --git a/metadata-service/factories/src/main/resources/application.yml b/metadata-service/factories/src/main/resources/application.yml
@@ -26,7 +26,7 @@ authentication:
 
 ingestion:
   enabled: ${UI_INGESTION_ENABLED:true}
-  defaultCliVersion: '${UI_INGESTION_DEFAULT_CLI_VERSION:0.8.20.0}'
+  defaultCliVersion: '${UI_INGESTION_DEFAULT_CLI_VERSION:0.8.23.1}'
 
 secretService:
   encryptionKey: ${SECRET_SERVICE_ENCRYPTION_KEY:ENCRYPTION_KEY}