From 5b72335ca08dad361895fc928918615cd63b2158 Mon Sep 17 00:00:00 2001
From: Willem Pienaar <6728866+woop@users.noreply.github.com>
Date: Sat, 22 Aug 2020 10:59:38 +0800
Subject: [PATCH] Revert job controller deployment for docker compose (#957)

---
 infra/docker-compose/.env.sample                |  1 -
 infra/docker-compose/core/core.yml              |  9 +++++++++
 infra/docker-compose/docker-compose.yml         | 17 -----------------
 .../jobcontroller/jobcontroller.yml             | 16 ----------------
 4 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 infra/docker-compose/jobcontroller/jobcontroller.yml

diff --git a/infra/docker-compose/.env.sample b/infra/docker-compose/.env.sample
index 4dcca0b60e..5c1f5af819 100644
--- 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
\ No newline at end of file
diff --git a/infra/docker-compose/core/core.yml b/infra/docker-compose/core/core.yml
index 16bd3a8118..7506a2dbe6 100644
--- 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
index 197ee56d17..61fc873f41 100644
--- 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
deleted file mode 100644
index 4d28d62f8c..0000000000
--- a/infra/docker-compose/jobcontroller/jobcontroller.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-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"
\ No newline at end of file