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

Merge pull request #8751 from hjkatz/patch-4

Browse Source 
Separate Kubernetes Ingress TLS spec from backend spec

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-04 17:03:26 +00:00
committed by GitHub
parent a89a683eb4 6ab3d5301c
commit 973c9d313e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,12 +552,6 @@ metadata:
spec: spec:
{% if kubernetes_ingress_hostname is defined %} {% if kubernetes_ingress_hostname is defined %}
{% if kubernetes_ingress_tls_secret is defined %}
tls:
- hosts:
- {{ kubernetes_ingress_hostname }}
secretName: {{ kubernetes_ingress_tls_secret }}
{% endif %}
rules: rules:
- host: {{ kubernetes_ingress_hostname }} - host: {{ kubernetes_ingress_hostname }}
http: http:
@@ -571,6 +565,12 @@ spec:
serviceName: {{ kubernetes_deployment_name }}-web-svc serviceName: {{ kubernetes_deployment_name }}-web-svc
servicePort: 80 servicePort: 80
{% endif %} {% endif %}
{% if kubernetes_ingress_tls_secret is defined %}
tls:
- hosts:
- {{ kubernetes_ingress_hostname }}
secretName: {{ kubernetes_ingress_tls_secret }}
{% endif %}
{% endif %} {% endif %}
{% if openshift_host is defined %} {% if openshift_host is defined %}
--- ---