kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix newline issue of priorityClassName when enable tolerations (#4164)

pull/4184/head
peerapach 2019-02-05 03:59:01 +07:00 committed by Kubernetes Prow Robot
parent 2e1e27219e
commit 69e5deeccc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2
View File

@ -32,7 +32,7 @@ spec:
{% if ingress_nginx_tolerations %} {% if ingress_nginx_tolerations %}
tolerations: tolerations:
{{ ingress_nginx_tolerations | to_nice_yaml(indent=2) | indent(width=8) }} {{ ingress_nginx_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
{%- endif %} {% endif %}
{% if kube_version is version('v1.11.1', '>=') %} {% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: {% if ingress_nginx_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}} priorityClassName: {% if ingress_nginx_namespace == 'kube-system' %}system-node-critical{% else %}k8s-cluster-critical{% endif %}{{''}}
{% endif %} {% endif %}