From ecb6dc3679806b0c17813c38cc9cae305a719a7e Mon Sep 17 00:00:00 2001 From: Ian Lewis Date: Wed, 23 Aug 2017 22:44:11 +0900 Subject: [PATCH] Register standalone master w/ taints (#1426) If Kubernetes > 1.6 register standalone master nodes w/ a node-role.kubernetes.io/master=:NoSchedule taint to allow for more flexible scheduling rather than just marking unschedulable. --- roles/kubernetes/node/templates/kubelet.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/kubernetes/node/templates/kubelet.j2 b/roles/kubernetes/node/templates/kubelet.j2 index 822153f39..cb5935178 100644 --- a/roles/kubernetes/node/templates/kubelet.j2 +++ b/roles/kubernetes/node/templates/kubelet.j2 @@ -36,8 +36,14 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" {% set kubelet_args_kubeconfig %}--kubeconfig={{ kube_config_dir}}/node-kubeconfig.yaml --require-kubeconfig{% endset %} {% if standalone_kubelet|bool %} {# We are on a master-only host. Make the master unschedulable in this case. #} +{% if kube_version | version_compare('v1.6', '>=') %} +{# Set taints on the master so that it's unschedulable by default. Use node-role.kubernetes.io/master taint like kubeadm. #} +{% set kubelet_args_kubeconfig %}{{ kubelet_args_kubeconfig }} --register-with-taints=node-role.kubernetes.io/master=:NoSchedule{% endset %} +{% else %} +{# --register-with-taints was added in 1.6 so just register unschedulable if Kubernetes < 1.6 #} {% set kubelet_args_kubeconfig %}{{ kubelet_args_kubeconfig }} --register-schedulable=false{% endset %} {% endif %} +{% endif %} {# Kubelet node labels #} {% if inventory_hostname in groups['kube-master'] %}