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

Merge pull request #36994 from gmarek/taints

Browse Source 
Automatic merge from submit-queue

Delete taint annotation when removing last taint

It messes with debugging of tests failures.

cc @davidopp @kevin-wangzefeng
This commit is contained in:
Kubernetes Submit Queue 2016-11-17 08:26:31 -08:00 committed by GitHub
commit 3ed6000c82
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/util.go
View File

@ -2587,10 +2587,14 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint api.Taint)
newTaints, err := deleteTaint(nodeTaints, taint) newTaints, err := deleteTaint(nodeTaints, taint)
ExpectNoError(err) ExpectNoError(err)
if len(newTaints) == 0 {
delete(node.Annotations, api.TaintsAnnotationKey)
} else {
taintsData, err := json.Marshal(newTaints) taintsData, err := json.Marshal(newTaints)
ExpectNoError(err) ExpectNoError(err)
node.Annotations[api.TaintsAnnotationKey] = string(taintsData) node.Annotations[api.TaintsAnnotationKey] = string(taintsData)
}
_, err = c.Core().Nodes().Update(node) _, err = c.Core().Nodes().Update(node)
if err != nil { if err != nil {
if !apierrs.IsConflict(err) { if !apierrs.IsConflict(err) {