github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Update tests to reflect that kubeadm taints should not override node taints

Browse Source
This commit is contained in:
Ashley 2018-06-14 10:57:34 -04:00
parent 792195eaa5
commit 35615881e3
No known key found for this signature in database
GPG Key ID: A1FDE6009238742A
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/kubeadm/app/phases/markmaster/markmaster_test.go
View File

@ -82,11 +82,28 @@ func TestMarkMaster(t *testing.T) {
"{}", "{}",
}, },
{ {
"nothing missing but taint unwanted", "has taint and no new taints wanted",
kubeadmconstants.LabelNodeRoleMaster, kubeadmconstants.LabelNodeRoleMaster,
[]v1.Taint{kubeadmconstants.MasterTaint}, []v1.Taint{
{
Key: "node.cloudprovider.kubernetes.io/uninitialized",
Effect: v1.TaintEffectNoSchedule,
},
},
nil, nil,
"{\"spec\":{\"taints\":null}}", "{}",
},
{
"has taint and should merge with wanted taint",
kubeadmconstants.LabelNodeRoleMaster,
[]v1.Taint{
{
Key: "node.cloudprovider.kubernetes.io/uninitialized",
Effect: v1.TaintEffectNoSchedule,
},
},
[]v1.Taint{kubeadmconstants.MasterTaint},
"{\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\"},{\"effect\":\"NoSchedule\",\"key\":\"node.cloudprovider.kubernetes.io/uninitialized\"}]}}",
}, },
} }