github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
kubeadm: add missing toleration for upgrade health check
This commit is contained in:
Kubernetes Prow Robot 2021-03-07 03:45:42 -08:00 committed by GitHub
commit 59012258ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kubeadm/app/phases/upgrade/health.go
View File

@ -126,7 +126,11 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration)
}, },
Tolerations: []v1.Toleration{ Tolerations: []v1.Toleration{
{ {
Key: "node-role.kubernetes.io/master", Key: constants.LabelNodeRoleOldControlPlane,
Effect: v1.TaintEffectNoSchedule,
},
{
Key: constants.LabelNodeRoleControlPlane,
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
}, },
}, },