Fix kubeadm v1beta1 configuration taint (#3928)
* Use master node taint same as kubeadm configuration v1alpha3 or before.
This commit is contained in:
parent
13efa95ef7
commit
8216e821d3
2 changed files with 4 additions and 5 deletions
|
@ -52,9 +52,9 @@ ingress_nginx_enabled: false
|
|||
# ingress_nginx_nodeselector:
|
||||
# node-role.kubernetes.io/master: ""
|
||||
# ingress_nginx_tolerations:
|
||||
# - key: "key"
|
||||
# - key: "node-role.kubernetes.io/master"
|
||||
# operator: "Equal"
|
||||
# value: "value"
|
||||
# value: ""
|
||||
# effect: "NoSchedule"
|
||||
# ingress_nginx_namespace: "ingress-nginx"
|
||||
# ingress_nginx_insecure_port: 80
|
||||
|
|
|
@ -9,9 +9,8 @@ nodeRegistration:
|
|||
{% endif %}
|
||||
{% if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] %}
|
||||
taints:
|
||||
- key: "kubeadmNode"
|
||||
value: "master"
|
||||
effect: "NoSchedule"
|
||||
- effect: NoSchedule
|
||||
key: node-role.kubernetes.io/master
|
||||
{% endif %}
|
||||
{% if container_manager == 'crio' %}
|
||||
criSocket: /var/run/crio/crio.sock
|
||||
|
|
Loading…
Reference in a new issue