From 1ab42afe6e43bcf65c81b61631df85dfd66a50dc Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Sat, 3 Oct 2020 21:39:52 -0400
Subject: [PATCH] Remove memcached

This has been gone upstream for a few releases
---
 roles/awx/defaults/main.yml       |  2 --
 roles/awx/templates/tower.yaml.j2 | 17 -----------------
 2 files changed, 19 deletions(-)

diff --git a/roles/awx/defaults/main.yml b/roles/awx/defaults/main.yml
index 7597bdc8..3d8cedfb 100644
--- a/roles/awx/defaults/main.yml
+++ b/roles/awx/defaults/main.yml
@@ -71,8 +71,6 @@ tower_web_extra_env: ''
 tower_task_extra_volume_mounts: ''
 tower_web_extra_volume_mounts: ''
 
-tower_memcached_image: memcached:alpine
-
 tower_redis_image: redis:latest
 
 tower_postgres_pass: awxpass
diff --git a/roles/awx/templates/tower.yaml.j2 b/roles/awx/templates/tower.yaml.j2
index 1f301479..a3e8bd08 100644
--- a/roles/awx/templates/tower.yaml.j2
+++ b/roles/awx/templates/tower.yaml.j2
@@ -29,17 +29,6 @@ spec:
         app: awx
     spec:
       containers:
-        - name: memcached
-          image: '{{ tower_memcached_image }}'
-          command:
-            - 'memcached'
-            - '-s'
-            - '/var/run/memcached/memcached.sock'
-            - '-a'
-            - '0666'
-          volumeMounts:
-            - name: {{ meta.name }}-memcached-socket
-              mountPath: "/var/run/memcached"
         - image: '{{ tower_redis_image }}'
           name: redis
           args: ["redis-server", "/etc/redis.conf"]
@@ -87,8 +76,6 @@ spec:
               readOnly: true
             - name: {{ meta.name }}-redis-socket
               mountPath: "/var/run/redis"
-            - name: {{ meta.name }}-memcached-socket
-              mountPath: "/var/run/memcached"
             - name: supervisor-socket
               mountPath: "/var/run/supervisor"
             - name: rsyslog-socket
@@ -145,8 +132,6 @@ spec:
               readOnly: true
             - name: {{ meta.name }}-redis-socket
               mountPath: "/var/run/redis"
-            - name: {{ meta.name }}-memcached-socket
-              mountPath: "/var/run/memcached"
             - name: supervisor-socket
               mountPath: "/var/run/supervisor"
             - name: rsyslog-socket
@@ -237,8 +222,6 @@ spec:
                 path: 'supervisor_task.conf'
         - name: {{ meta.name }}-redis-socket
           emptyDir: {}
-        - name: {{ meta.name }}-memcached-socket
-          emptyDir: {}
         - name: supervisor-socket
           emptyDir: {}
         - name: rsyslog-socket