From 667b27fe78eddb3a9dc20e8f8e66b559cb8a96c0 Mon Sep 17 00:00:00 2001
From: Egor Margineanu <egor.margineanu@gmail.com>
Date: Wed, 19 Feb 2020 10:11:34 +0200
Subject: [PATCH 1/2] Added support for K8S imagePullSecrets

---
 installer/roles/kubernetes/templates/deployment.yml.j2     | 4 ++++
 installer/roles/kubernetes/templates/management-pod.yml.j2 | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
index 7a84e3d52a..34c7e922fd 100644
--- a/installer/roles/kubernetes/templates/deployment.yml.j2
+++ b/installer/roles/kubernetes/templates/deployment.yml.j2
@@ -202,6 +202,10 @@ spec:
           volumeMounts:
             - name: custom-venvs
               mountPath: {{ custom_venvs_path }}
+{% endif %}
+{% if kubernetes_image_pull_secrets is defined %}
+      imagePullSecrets:
+        - name: "{{ kubernetes_image_pull_secrets }}"
 {% endif %}
       containers:
         - name: {{ kubernetes_deployment_name }}-web
diff --git a/installer/roles/kubernetes/templates/management-pod.yml.j2 b/installer/roles/kubernetes/templates/management-pod.yml.j2
index 9cb35932ce..14d8b61cc5 100644
--- a/installer/roles/kubernetes/templates/management-pod.yml.j2
+++ b/installer/roles/kubernetes/templates/management-pod.yml.j2
@@ -5,6 +5,10 @@ metadata:
   name: ansible-tower-management
   namespace: {{ kubernetes_namespace }}
 spec:
+{% if kubernetes_image_pull_secrets is defined %}
+  imagePullSecrets:
+    - name: "{{ kubernetes_image_pull_secrets }}"
+{% endif %}
   containers:
     - name: ansible-tower-management
       image: "{{ kubernetes_task_image }}:{{ kubernetes_task_version }}"

From 74a31224e0f873e3627cbbaff6aedf9a409454dc Mon Sep 17 00:00:00 2001
From: Egor Margineanu <egor.margineanu@gmail.com>
Date: Wed, 19 Feb 2020 10:45:07 +0200
Subject: [PATCH 2/2] Moved imagePullSecrets into ServiceAccount definition

---
 installer/roles/kubernetes/templates/deployment.yml.j2 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
index 34c7e922fd..dbe61afc83 100644
--- a/installer/roles/kubernetes/templates/deployment.yml.j2
+++ b/installer/roles/kubernetes/templates/deployment.yml.j2
@@ -4,6 +4,10 @@ kind: ServiceAccount
 metadata:
   name: awx
   namespace: {{ kubernetes_namespace }}
+{% if kubernetes_image_pull_secrets is defined %}
+imagePullSecrets:
+  - name: "{{ kubernetes_image_pull_secrets }}"
+{% endif %}
 
 ---
 kind: Service
@@ -202,10 +206,6 @@ spec:
           volumeMounts:
             - name: custom-venvs
               mountPath: {{ custom_venvs_path }}
-{% endif %}
-{% if kubernetes_image_pull_secrets is defined %}
-      imagePullSecrets:
-        - name: "{{ kubernetes_image_pull_secrets }}"
 {% endif %}
       containers:
         - name: {{ kubernetes_deployment_name }}-web