C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix kubeadm v1beta1 configuration taint (#3928)

Browse source 
* Use master node taint same as kubeadm configuration v1alpha3 or before.
This commit is contained in:
okamototk 2019-01-03 20:42:23 +09:00 committed by Kubernetes Prow Robot
parent 13efa95ef7
commit 8216e821d3
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
inventory/sample/group_vars/k8s-cluster/addons.yml
View file

@ -52,9 +52,9 @@ ingress_nginx_enabled: false
# ingress_nginx_nodeselector: # ingress_nginx_nodeselector:
# node-role.kubernetes.io/master: "" # node-role.kubernetes.io/master: ""
# ingress_nginx_tolerations: # ingress_nginx_tolerations:
# - key: "key" # - key: "node-role.kubernetes.io/master"
# operator: "Equal" # operator: "Equal"
# value: "value" # value: ""
# effect: "NoSchedule" # effect: "NoSchedule"
# ingress_nginx_namespace: "ingress-nginx" # ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_insecure_port: 80 # ingress_nginx_insecure_port: 80

5
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View file

@ -9,9 +9,8 @@ nodeRegistration:
{% endif %} {% endif %}
{% if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] %} {% if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] %}
taints: taints:
- key: "kubeadmNode" - effect: NoSchedule
value: "master" key: node-role.kubernetes.io/master
effect: "NoSchedule"
{% endif %} {% endif %}
{% if container_manager == 'crio' %} {% if container_manager == 'crio' %}
criSocket: /var/run/crio/crio.sock criSocket: /var/run/crio/crio.sock