Browse Source

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

pull/4184/head
peerapach 6 years ago
committed by Kubernetes Prow Robot
parent
commit
69e5deeccc
1 changed files with 1 additions and 1 deletions
  1. 2
      roles/kubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2

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

@ -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 %}

Loading…
Cancel
Save