From 7659ffca1e19884f4153ab4c28a1902774504c36 Mon Sep 17 00:00:00 2001
From: "Vyacheslav Andreykiv (Intel)"
 <vandreyk@nkuruppu-mobl.amr.corp.intel.com>
Date: Mon, 27 Apr 2020 14:33:42 -0700
Subject: [PATCH] fixed ingress template

---
 installer/roles/kubernetes/tasks/main.yml            | 12 ++++++------
 .../roles/kubernetes/templates/deployment.yml.j2     |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/installer/roles/kubernetes/tasks/main.yml b/installer/roles/kubernetes/tasks/main.yml
index 3ff39968b4..57956d8c39 100644
--- a/installer/roles/kubernetes/tasks/main.yml
+++ b/installer/roles/kubernetes/tasks/main.yml
@@ -64,7 +64,7 @@
       template:
         src: postgresql-persistent.yml.j2
         dest: "{{ kubernetes_base_path }}/postgresql-persistent.yml"
-        mode: '0600'
+        mode: "0600"
 
     - name: Deploy and Activate Postgres (OpenShift)
       shell: |
@@ -209,11 +209,11 @@
   set_fact:
     "{{ item }}": "{{ lookup('template', item + '.yml.j2') }}"
   with_items:
-    - 'configmap'
-    - 'secret'
-    - 'deployment'
-    - 'supervisor'
-    - 'launch_awx'
+    - "configmap"
+    - "secret"
+    - "deployment"
+    - "supervisor"
+    - "launch_awx"
   no_log: true
 
 - name: Apply Deployment
diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2
index 1e55dff6f5..2da7d6ffaa 100644
--- a/installer/roles/kubernetes/templates/deployment.yml.j2
+++ b/installer/roles/kubernetes/templates/deployment.yml.j2
@@ -136,7 +136,7 @@ spec:
             - name: {{ kubernetes_deployment_name }}-launch-awx-task
               mountPath: "/usr/bin/launch_awx_task.sh"
               subPath: "launch_awx_task.sh"
-              readOnly: true  
+              readOnly: true
 
             - name: {{ kubernetes_deployment_name }}-supervisor-web-config
               mountPath: "/supervisor.conf"
@@ -212,7 +212,7 @@ spec:
             - name: {{ kubernetes_deployment_name }}-launch-awx-task
               mountPath: "/usr/bin/launch_awx_task.sh"
               subPath: "launch_awx_task.sh"
-              readOnly: true  
+              readOnly: true
 
             - name: {{ kubernetes_deployment_name }}-supervisor-web-config
               mountPath: "/supervisor.conf"
@@ -447,8 +447,10 @@ metadata:
 {% for key, value in kubernetes_ingress_annotations.items() %}
     {{ key }}: {{ value }}
 {% endfor %}
+{% endif %}
 
 spec:
+{% if kubernetes_ingress_hostname is defined %}
 {% if kubernetes_ingress_tls_secret is defined %}
   tls:
   - hosts: