github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97819 from damemi/bz1876918-priorities-test-refactor

Browse Source 
Move deferred taint cleanup call to ensure all are removed
This commit is contained in:
Kubernetes Prow Robot
2021-02-06 21:37:12 -08:00
committed by GitHub
parent 425d29b39a cc1eab1ca2
commit 23a46d8843
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/node/resource.go
View File

@@ -584,6 +584,14 @@ func CreatePodsPerNodeForSimpleApp(c clientset.Interface, namespace, appName str
return podLabels
}
// RemoveTaintsOffNode removes a list of taints from the given node
// It is simply a helper wrapper for RemoveTaintOffNode
func RemoveTaintsOffNode(c clientset.Interface, nodeName string, taints []v1.Taint) {
for _, taint := range taints {
RemoveTaintOffNode(c, nodeName, taint)
}
}
// RemoveTaintOffNode removes the given taint from the given node.
func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint v1.Taint) {
err := removeNodeTaint(c, nodeName, nil, &taint)