Skip to content
Snippets Groups Projects
Commit 993b8e27 authored by Michal Belica's avatar Michal Belica Committed by k8s-ci-robot
Browse files

Add support to set tolerations for ingress-nginx (#3742)

Introduced variable `ingress_nginx_tolerations` to set custom
tolerations for Ingress nginx daemonset, to be able to schedule
ingress-nginx on dedicated nodes with taints.
parent 9a5438ce
No related branches found
No related tags found
No related merge requests found
...@@ -51,6 +51,11 @@ ingress_nginx_enabled: false ...@@ -51,6 +51,11 @@ ingress_nginx_enabled: false
# ingress_nginx_host_network: false # ingress_nginx_host_network: false
# ingress_nginx_nodeselector: # ingress_nginx_nodeselector:
# node-role.kubernetes.io/master: "" # node-role.kubernetes.io/master: ""
# ingress_nginx_tolerations:
# - key: "key"
# operator: "Equal"
# value: "value"
# effect: "NoSchedule"
# ingress_nginx_namespace: "ingress-nginx" # ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_insecure_port: 80 # ingress_nginx_insecure_port: 80
# ingress_nginx_secure_port: 443 # ingress_nginx_secure_port: 443
......
...@@ -3,6 +3,7 @@ ingress_nginx_namespace: "ingress-nginx" ...@@ -3,6 +3,7 @@ ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false ingress_nginx_host_network: false
ingress_nginx_nodeselector: ingress_nginx_nodeselector:
node-role.kubernetes.io/master: "" node-role.kubernetes.io/master: ""
ingress_nginx_tolerations: []
ingress_nginx_insecure_port: 80 ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443 ingress_nginx_secure_port: 443
ingress_nginx_configmap: {} ingress_nginx_configmap: {}
......
...@@ -29,6 +29,10 @@ spec: ...@@ -29,6 +29,10 @@ spec:
nodeSelector: nodeSelector:
{{ ingress_nginx_nodeselector | to_nice_yaml }} {{ ingress_nginx_nodeselector | to_nice_yaml }}
{%- endif %} {%- endif %}
{% if ingress_nginx_tolerations %}
tolerations:
{{ ingress_nginx_tolerations | to_nice_yaml(indent=2) | indent(width=8) }}
{%- 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 %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment