From e9f4ff227e41915472fcd4eda6ff37245a5d6960 Mon Sep 17 00:00:00 2001
From: yydzhou <dzhou.ustc@gmail.com>
Date: Wed, 3 Mar 2021 05:35:20 -0800
Subject: [PATCH] fix master node taint removal bug (#7336)
code improvement
---
roles/kubernetes/control-plane/tasks/kubeadm-setup.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
index 6fa9cfd7f..e71b9b586 100644
--- a/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
+++ b/roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
@@ -238,7 +238,10 @@
# FIXME(mattymo): from docs: If you don't want to taint your control-plane node, set this field to an empty slice, i.e. `taints: {}` in the YAML file.
- name: kubeadm | Remove taint for master with node role
- command: "{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf taint node {{ inventory_hostname }} node-role.kubernetes.io/master:NoSchedule- node-role.kubernetes.io/control-plane:NoSchedule-"
+ command: "{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf taint node {{ inventory_hostname }} {{ item }}"
delegate_to: "{{ groups['kube-master'] | first }}"
+ with_items:
+ - "node-role.kubernetes.io/master:NoSchedule-"
+ - "node-role.kubernetes.io/control-plane:NoSchedule-"
when: inventory_hostname in groups['kube-node']
failed_when: false
--
GitLab