From 3e95f9d491bd5bc538136935b402788bb95a756c Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 6 Mar 2021 23:09:28 +0200 Subject: [PATCH] kubeadm: add missing taint for upgrade health check This is part of the "master" -> "control-plane" rename that we missed. It's not critical for 1.21 as the "control-plane" taint is still not added to CP nodes, but it would be best to add the toleration preemptively like the KEP planned. --- cmd/kubeadm/app/phases/upgrade/health.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/phases/upgrade/health.go b/cmd/kubeadm/app/phases/upgrade/health.go index 1f54cbe2d2d..7ac2fa317cc 100644 --- a/cmd/kubeadm/app/phases/upgrade/health.go +++ b/cmd/kubeadm/app/phases/upgrade/health.go @@ -126,7 +126,11 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration) }, Tolerations: []v1.Toleration{ { - Key: "node-role.kubernetes.io/master", + Key: constants.LabelNodeRoleOldControlPlane, + Effect: v1.TaintEffectNoSchedule, + }, + { + Key: constants.LabelNodeRoleControlPlane, Effect: v1.TaintEffectNoSchedule, }, },