Merge pull request #99904 from neolit123/1.21-health-check-master-taint

kubeadm: add missing toleration for upgrade health check
2021-03-07 03:45:42 -08:00
parent 90851a0fb5 3e95f9d491
commit 59012258ca
1 changed files with 5 additions and 1 deletions
--- 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,
 						},
 					},