From e623c3d7cd997c9c12dd7306a9dafd49dde6065a Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 25 Apr 2018 11:17:26 -0400
Subject: [PATCH 1/2] =?UTF-8?q?Don=E2=80=99t=20hardcode=20Helm=20PostgreSQ?=
 =?UTF-8?q?L=20deployment=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/roles/kubernetes/tasks/kubernetes.yml | 2 +-
 installer/roles/kubernetes/tasks/main.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/installer/roles/kubernetes/tasks/kubernetes.yml b/installer/roles/kubernetes/tasks/kubernetes.yml
index c2f222263a..14837e824c 100644
--- a/installer/roles/kubernetes/tasks/kubernetes.yml
+++ b/installer/roles/kubernetes/tasks/kubernetes.yml
@@ -12,5 +12,5 @@
 
 - name: Set postgresql service name
   set_fact:
-    postgresql_service_name: "{{ kubernetes_namespace }}-postgresql"
+    postgresql_service_name: "{{ kubernetes_deployment_name }}-postgresql"
   when: "pg_hostname is not defined or pg_hostname == ''"
diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml
index 09ffc7fad8..da66f027f9 100644
--- a/installer/roles/kubernetes/tasks/main.yml
+++ b/installer/roles/kubernetes/tasks/main.yml
@@ -50,7 +50,7 @@
 
 - name: Deploy and Activate Postgres (Kubernetes)
   shell: |
-    helm install --name awx --namespace {{ kubernetes_namespace }} \
+    helm install --name {{ kubernetes_deployment_name }} --namespace {{ kubernetes_namespace }} \
       --set postgresUser={{ pg_username }} \
       --set postgresPassword={{ pg_password }} \
       --set postgresDatabase={{ pg_database }} \

From e5faf0798ffa70be846a12264ce27a944e749834 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 25 Apr 2018 11:17:37 -0400
Subject: [PATCH 2/2] Always pull memcached image

---
 installer/roles/kubernetes/templates/deployment.yml.j2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
index 32bf73ef9e..4234a62ca3 100644
--- a/installer/roles/kubernetes/templates/deployment.yml.j2
+++ b/installer/roles/kubernetes/templates/deployment.yml.j2
@@ -213,6 +213,7 @@ spec:
               cpu: "{{ rabbitmq_cpu_request }}m"
         - name: {{ kubernetes_deployment_name }}-memcached
           image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
+          imagePullPolicy: Always
           resources:
             requests:
               memory: "{{ memcached_mem_request }}Gi"