From 69e5deecccf8afeba5a5fee295816b93ee7ec200 Mon Sep 17 00:00:00 2001 From: peerapach Date: Tue, 5 Feb 2019 03:59:01 +0700 Subject: [PATCH] Fix newline issue of priorityClassName when enable tolerations (#4164) --- .../ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 index e6a512935..792a3f55c 100644 --- a/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 +++ b/roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 @@ -32,7 +32,7 @@ spec: {% if ingress_nginx_tolerations %} tolerations: {{ ingress_nginx_tolerations | to_nice_yaml(indent=2) | indent(width=8) }} -{%- endif %} +{% endif %} {% if kube_version is version('v1.11.1', '>=') %} priorityClassName: {% if ingress_nginx_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}} {% endif %}