handle "master" label/taint changes for kubeadm 1.24

As per the kubeadm KEP for "master" label/taint changes:
- kubeadm 1.24 nodes will only have the "control-plane" label.
- kubeadm 1.24 nodes will have both the "master"
and "control-plane" taints.
- kubeadm 1.25 nodes will have only the "control-plane" taint

Adapt kind to these changes and add TODOs with links
for the tracking issue in k-sigs/kind.
This commit is contained in:
Lubomir I. Ivanov
2022-01-17 15:34:46 +02:00
parent 6944813b2d
commit 26de74a756
4 changed files with 59 additions and 12 deletions

View File

@@ -88,7 +88,13 @@ spec:
spec:
nodeSelector:
kubernetes.io/os: linux
# TODO: Remove the "master" taint after kubeadm nodes no longer have it.
# This can be done once kind no longer supports kubeadm 1.24.
# https://github.com/kubernetes-sigs/kind/issues/1699
tolerations:
- key: node-role.kubernetes.io/control-plane
operator: Equal
effect: NoSchedule
- key: node-role.kubernetes.io/master
operator: Equal
effect: NoSchedule