From 6ab3d5301cd52394c2a740c98d8db10e2ec210a4 Mon Sep 17 00:00:00 2001 From: Harrison Katz Date: Fri, 4 Dec 2020 10:50:49 -0500 Subject: [PATCH] Separate Kubernetes Ingress TLS spec from backend spec --- .../roles/kubernetes/templates/deployment.yml.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/installer/roles/kubernetes/templates/deployment.yml.j2 b/installer/roles/kubernetes/templates/deployment.yml.j2 index 2f1a245349..019cf2fb36 100644 --- a/installer/roles/kubernetes/templates/deployment.yml.j2 +++ b/installer/roles/kubernetes/templates/deployment.yml.j2 @@ -546,12 +546,6 @@ metadata: spec: {% 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: - host: {{ kubernetes_ingress_hostname }} http: @@ -566,6 +560,12 @@ spec: serviceName: {{ kubernetes_deployment_name }}-web-svc servicePort: 80 {% endif %} +{% if kubernetes_ingress_tls_secret is defined %} + tls: + - hosts: + - {{ kubernetes_ingress_hostname }} + secretName: {{ kubernetes_ingress_tls_secret }} +{% endif %} {% endif %} {% if openshift_host is defined %} ---