Revert "Revert job controller deployment for docker compose (feast-de…

…v#957)" This reverts commit 5b72335.
pyalex · Aug 24, 2020 · 65081e3 · 65081e3
1 parent 5b72335
commit 65081e3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/infra/docker-compose/.env.sample b/infra/docker-compose/.env.sample
@@ -2,6 +2,7 @@ COMPOSE_PROJECT_NAME=feast
 FEAST_VERSION=0.6.2
 GCP_SERVICE_ACCOUNT=./gcp-service-accounts/key.json
 FEAST_CORE_CONFIG=./core/core.yml
+FEAST_JOB_CONTROLLER_CONFIG=./jobcontroller/jobcontroller.yml
 FEAST_HISTORICAL_SERVING_CONFIG=./serving/historical-serving.yml
 FEAST_HISTORICAL_SERVING_ENABLED=false
 FEAST_ONLINE_SERVING_CONFIG=./serving/online-serving.yml
diff --git a/infra/docker-compose/core/core.yml b/infra/docker-compose/core/core.yml
@@ -1,13 +1,4 @@
 feast:
-  jobs:
-    polling_interval_milliseconds: 20000
-    job_update_timeout_seconds: 240
-    active_runner: direct
-    runners:
-      - name: direct
-        type: DirectRunner
-        options:
-          tempLocation: gs://bucket/tempLocation
   stream:
     type: kafka
     options:

diff --git a/infra/docker-compose/docker-compose.yml b/infra/docker-compose/docker-compose.yml
@@ -21,6 +21,23 @@ services:
       - /opt/feast/feast-core.jar
       - --spring.config.location=classpath:/application.yml,file:/etc/feast/application.yml
 
+  jobcontroller:
+    image: gcr.io/kf-feast/feast-jobcontroller:${FEAST_VERSION}
+    volumes:
+      - ${FEAST_JOB_CONTROLLER_CONFIG}:/etc/feast/application.yml
+      - ${GCP_SERVICE_ACCOUNT}:/etc/gcloud/service-accounts/key.json
+    environment:
+      GOOGLE_APPLICATION_CREDENTIALS: /etc/gcloud/service-accounts/key.json
+    depends_on:
+      - kafka
+    ports:
+      - 6570:6570
+    command:
+      - java
+      - -jar
+      - /opt/feast/feast-job-controller.jar
+      - --spring.config.location=classpath:/application.yml,file:/etc/feast/application.yml
+
   jupyter:
     image: gcr.io/kf-feast/feast-jupyter:${FEAST_VERSION}
     volumes:

diff --git a/infra/docker-compose/jobcontroller/jobcontroller.yml b/infra/docker-compose/jobcontroller/jobcontroller.yml
@@ -0,0 +1,16 @@
+feast:
+  core-host: core
+  jobs:
+    polling_interval_milliseconds: 20000
+    job_update_timeout_seconds: 240
+    active_runner: direct
+    runners:
+      - name: direct
+        type: DirectRunner
+        options:
+          tempLocation: gs://bucket/tempLocation
+  stream:
+    type: kafka
+    options:
+      topic: feast-features
+      bootstrapServers: "kafka:9092,localhost:9094"