diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-05-06 18:53:36 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-05-06 18:53:36 +0200 |
| commit | 80b3cc9a6a13a1a4e54f7996ff69c7f3d15fca95 (patch) | |
| tree | 0c1003146c19ee064c35ba7ae59957b55df0b3a2 /roles | |
| parent | k8s-chtest: upgrade cluster to 1.27.1 (diff) | |
kubernetes/kubeadm: remove deprecated control plane taints
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/kubernetes/kubeadm/control-plane/tasks/main.yml | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/main.yml b/roles/kubernetes/kubeadm/control-plane/tasks/main.yml index b6160dab..7c68bcd5 100644 --- a/roles/kubernetes/kubeadm/control-plane/tasks/main.yml +++ b/roles/kubernetes/kubeadm/control-plane/tasks/main.yml @@ -31,27 +31,17 @@ set_fact: kube_node_taints: "{% set node_info = kubectl_get_node.stdout | from_json %}{%if node_info.spec.taints is defined %}{{ node_info.spec.taints | map(attribute='key') | list }}{% endif %}" -- name: remove taint from control-plane node - when: not kubernetes.dedicated_controlplane_nodes - block: - - name: remove control-plane taint from node - when: "'node-role.kubernetes.io/control-plane' in kube_node_taints" - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ kubernetes_node_name }} node-role.kubernetes.io/control-plane-" +- name: remove control-plane taint from node + when: + - not kubernetes.dedicated_controlplane_nodes + - "'node-role.kubernetes.io/control-plane' in kube_node_taints" + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ kubernetes_node_name }} node-role.kubernetes.io/control-plane-" - - name: remove deprecated master taint from node - when: "'node-role.kubernetes.io/master' in kube_node_taints" - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ kubernetes_node_name }} node-role.kubernetes.io/master-" - -- name: add taint from control-plane node - when: kubernetes.dedicated_controlplane_nodes - block: - - name: add control-plane taint to node - when: "'node-role.kubernetes.io/control-plane' not in kube_node_taints" - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ kubernetes_node_name }} node-role.kubernetes.io/control-plane='':NoSchedule" - - - name: add deprecated master taint to node - when: "'node-role.kubernetes.io/master' not in kube_node_taints" - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ kubernetes_node_name }} node-role.kubernetes.io/master='':NoSchedule" +- name: add control-plane taint to node + when: + - kubernetes.dedicated_controlplane_nodes + - "'node-role.kubernetes.io/control-plane' not in kube_node_taints" + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ kubernetes_node_name }} node-role.kubernetes.io/control-plane='':NoSchedule" - name: prepare kubectl (1/2) file: |