Revert job controller deployment for docker compose (feast-dev#957)

pyalex · Aug 22, 2020 · 5b72335 · 5b72335
1 parent 16bb358
commit 5b72335
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/infra/docker-compose/.env.sample b/infra/docker-compose/.env.sample
@@ -2,7 +2,6 @@ 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,4 +1,13 @@
 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,23 +21,6 @@ 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