Remove image push logic from installer roles

I’m going to be reusing this code on the Tower side, and I’m trying to refactor some of the AWX specific bits out. There will probably be more to come, but this is a good start.

installer/roles/kubernetes/defaults/main.yml

@@ -1,4 +1,7 @@
 ---
+dockerhub_web_image: "{{ dockerhub_base | default('ansible') }}/awx_web:{{ dockerhub_version | default('latest') }}"
+dockerhub_task_image: "{{ dockerhub_base | default('ansible') }}/awx_task:{{ dockerhub_version | default('latest') }}"
+
 web_mem_request: 1
 web_cpu_request: 500
 
@@ -11,11 +14,11 @@ rabbitmq_cpu_request: 500
 memcached_mem_request: 1
 memcached_cpu_request: 500
 
-rabbitmq_version: "3.7.4"
-rabbitmq_image: "ansible/awx_rabbitmq:{{ rabbitmq_version }}"
+kubernetes_rabbitmq_version: "3.7.4"
+kubernetes_rabbitmq_image: "ansible/awx_rabbitmq"
 
-memcached_version: "latest"
-memcached_image: "memcached:{{ memcached_version }}"
+kubernetes_memcached_version: "latest"
+kubernetes_memcached_image: "memcached"
 
 openshift_pg_emptydir: no
 openshift_pg_pvc_name: postgresql

installer/roles/kubernetes/tasks/main.yml

@@ -23,34 +23,6 @@
   ignore_errors: yes
   when: "pg_hostname is not defined or pg_hostname == ''"
 
-- name: Manage AWX Container Images
-  include_role:
-    name: image_push
-  when: dockerhub_base is not defined
-
-- name: Set image names
-  block:
-    - name: Enable image stream lookups for awx images
-      shell: "{{ openshift_oc_bin }} set image-lookup --all -n {{ kubernetes_namespace }}"
-      when: openshift_host is defined
-
-    - name: Set full web image path
-      set_fact:
-        web_kubernetes_image: "{{ web_image }}:{{ version }}"
-      when: web_kubernetes_image is not defined
-
-    - name: Set full task image path
-      set_fact:
-        task_kubernetes_image: "{{ task_image }}:{{ version }}"
-      when: task_kubernetes_image is not defined
-  when: dockerhub_base is not defined
-
-- name: Set DockerHub Image Paths
-  set_fact:
-    web_kubernetes_image: "{{ dockerhub_base }}/awx_web:{{ dockerhub_version }}"
-    task_kubernetes_image: "{{ dockerhub_base }}/awx_task:{{ dockerhub_version }}"
-  when: dockerhub_base is defined
-
 - name: Deploy PostgreSQL (OpenShift)
   block:
     - name: Template PostgreSQL Deployment
@@ -113,6 +85,19 @@
     dest: "{{ kubernetes_base_path }}/configmap.yml"
     mode: '0600'
 
+- name: Set image names if using custom registry
+  block:
+    - name: Set task image name
+      set_fact:
+        kubernetes_task_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ task_image }}"
+      when: kubernetes_task_image is not defined
+
+    - name: Set web image name
+      set_fact:
+        kubernetes_web_image: "{{ docker_registry }}/{{ docker_registry_repository }}/{{ web_image }}"
+      when: kubernetes_web_image is not defined
+  when: docker_registry is defined
+
 - name: Template Kubernetes AWX Deployment
   template:
     src: deployment.yml.j2

installer/roles/kubernetes/templates/deployment.yml.j2

@@ -131,7 +131,7 @@ spec:
       serviceAccountName: rabbitmq
       containers:
         - name: {{ kubernetes_deployment_name }}-web
-          image: {{ web_kubernetes_image }}
+          image: {{ kubernetes_web_image | default(dockerhub_web_image) }}
           imagePullPolicy: Always
           ports:
             - containerPort: 8052
@@ -143,7 +143,7 @@ spec:
               memory: "{{ web_mem_request }}Gi"
               cpu: "{{ web_cpu_request }}m"
         - name: {{ kubernetes_deployment_name }}-celery
-          image: {{ task_kubernetes_image }}
+          image: {{ kubernetes_task_image | default(dockerhub_task_image) }}
           imagePullPolicy: Always
           volumeMounts:
             - mountPath: /etc/tower
@@ -172,7 +172,7 @@ spec:
               memory: "{{ task_mem_request }}Gi"
               cpu: "{{ task_cpu_request }}m"
         - name: {{ kubernetes_deployment_name }}-rabbit
-          image: {{ rabbitmq_image }}
+          image: "{{ kubernetes_rabbitmq_image }}:{{ kubernetes_rabbitmq_version }}"
           imagePullPolicy: Always
           ports:
             - name: http
@@ -212,7 +212,7 @@ spec:
               memory: "{{ rabbitmq_mem_request }}Gi"
               cpu: "{{ rabbitmq_cpu_request }}m"
         - name: {{ kubernetes_deployment_name }}-memcached
-          image: {{ memcached_image }}
+          image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
           resources:
             requests:
               memory: "{{ memcached_mem_request }}Gi"