diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-01-03 18:27:03 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-01-03 18:27:03 +0100 |
| commit | 091a21ddffd4385cacd3041b71c4d793b657640b (patch) | |
| tree | b2caf710f230fd064013f6402520ec18e3ca53e2 /roles/kubernetes | |
| parent | infobeamer: configure video resolution via userconfig.txt and tvservice file (diff) | |
kubernetes future proof node-role labels: master vs. control-plane
Diffstat (limited to 'roles/kubernetes')
| -rw-r--r-- | roles/kubernetes/kubeadm/master/tasks/main.yml | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/roles/kubernetes/kubeadm/master/tasks/main.yml b/roles/kubernetes/kubeadm/master/tasks/main.yml index 19037adc..04df760f 100644 --- a/roles/kubernetes/kubeadm/master/tasks/main.yml +++ b/roles/kubernetes/kubeadm/master/tasks/main.yml @@ -31,14 +31,28 @@ 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 master node - when: not kubernetes.dedicated_master and 'node-role.kubernetes.io/master' in kube_node_taints - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/master-" +- name: remove taint from master/control-plane node + when: not kubernetes.dedicated_master + block: + - name: remove master taint from node + when: "'node-role.kubernetes.io/master' in kube_node_taints" + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/master-" -- name: add taint for master node - when: kubernetes.dedicated_master and 'node-role.kubernetes.io/master' not in kube_node_taints - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/master='':NoSchedule" + - 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 {{ inventory_hostname }} node-role.kubernetes.io/control-plane-" +- name: add taint from master/control-plane node + when: kubernetes.dedicated_master + block: + - name: add master taint from node + when: "'node-role.kubernetes.io/master' not in kube_node_taints" + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/master='':NoSchedule" + + ## TODO: enable this once all needed addons and workloads have tolerations set accordingly + # - name: add control-plane taint from node + # when: "'node-role.kubernetes.io/control-plane' not in kube_node_taints" + # command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ inventory_hostname }} node-role.kubernetes.io/control-plane='':NoSchedule" - name: prepare kubectl (1/2) file: |