External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6848 from vandreykiv/devel

Browse Source 
Updated ingress template for kubernetes to support HTTP and HTTPS when annotations not set

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-28 16:52:46 +00:00
committed by GitHub
parent b31abbba82 d5cb6ad58a
commit fcc99baaa8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/kubernetes/templates/deployment.yml.j2
View File

@@ -447,8 +447,10 @@ metadata:
{% for key, value in kubernetes_ingress_annotations.items() %} {% for key, value in kubernetes_ingress_annotations.items() %}
{{ key }}: {{ value }} {{ key }}: {{ value }}
{% endfor %} {% endfor %}
{% endif %}
spec: spec:
{% if kubernetes_ingress_hostname is defined %}
{% if kubernetes_ingress_tls_secret is defined %} {% if kubernetes_ingress_tls_secret is defined %}
tls: tls:
- hosts: - hosts: