From 3844e82b8cae7d44c83828c87c8c76532007349b Mon Sep 17 00:00:00 2001
From: Marwan Sulaiman <marwan.sameer@gmail.com>
Date: Thu, 1 Nov 2018 11:24:46 -0400
Subject: [PATCH] Remove redis from toml file (#845)

* Remove redis from toml file

* remove redis from yamls
---
 charts/proxy/templates/deployment.yaml | 4 ----
 charts/proxy/values.yaml               | 8 --------
 config.dev.toml                        | 5 -----
 docker-compose.yml                     | 5 -----
 4 files changed, 22 deletions(-)

diff --git a/charts/proxy/templates/deployment.yaml b/charts/proxy/templates/deployment.yaml
index f8947fa6..69c37a2e 100644
--- a/charts/proxy/templates/deployment.yaml
+++ b/charts/proxy/templates/deployment.yaml
@@ -41,10 +41,6 @@ spec:
         - name: ATHENS_TRACE_EXPORTER
           value: "jaeger"
         {{- end }}
-        # TODO: re-enable when workers are used
-        # SPACES of template must be fixed back while re-enabling
-        #- name: ATHENS_REDIS_QUEUE_ADDRESS
-        #  value: { { .Values.redis.address | quote } }
         ports:
         - containerPort: 3000
         {{- if eq .Values.storage.type "disk" }}
diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml
index 6437e482..23e5fa6c 100644
--- a/charts/proxy/values.yaml
+++ b/charts/proxy/values.yaml
@@ -46,14 +46,6 @@ netrc:
   # if enabled, it expects to find the content of a valid .netrc file imported as a secret named netrcsecret
   enabled: false
 
-# Worker is disabled right now. When it's turned on, we can use helm dependencies to start this up!
-#redis:
-#  useEmbedded: false
-#  address: ":6379"
-#  username: 
-#  password:
-#  host:
-
 jaeger:
   ## Type of service; valid values are "ClusterIP", "LoadBalancer", and "NodePort".
   type: ClusterIP
diff --git a/config.dev.toml b/config.dev.toml
index 9ded2d7a..f54ab2e8 100644
--- a/config.dev.toml
+++ b/config.dev.toml
@@ -70,11 +70,6 @@ Timeout = 300
     # Env override: ATHENS_GLOBAL_ENDPOINT
     GlobalEndpoint = "http://localhost:3001"
 
-    # Redis queue for buffalo workers
-    # Defaults to ":6379"
-    # Env override: ATHENS_REDIS_QUEUE_ADDRESS
-    RedisQueueAddress = ":6379"
-
     # Username for basic auth
     # Env override: BASIC_AUTH_USER
     BasicAuthUser = ""
diff --git a/docker-compose.yml b/docker-compose.yml
index 49d81368..fa5bea4a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,5 @@
 version: '3'
 services:
-  redis:
-    image: redis:alpine
-    command: ["redis-server", "--appendonly", "yes"]
-    ports:
-      - "6379:6379"
   mongo:
     image: mongo:3.7.9-jessie
     ports: