From eecc8400748715153d23f1b6e8e6eb4e88162a76 Mon Sep 17 00:00:00 2001 From: gmarek Date: Thu, 17 Nov 2016 16:02:34 +0100 Subject: [PATCH] Delete taint annotation when removing last taint --- test/e2e/framework/util.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index cb90e597a7f..d85defaa38c 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -2587,10 +2587,14 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint api.Taint) newTaints, err := deleteTaint(nodeTaints, taint) ExpectNoError(err) + if len(newTaints) == 0 { + delete(node.Annotations, api.TaintsAnnotationKey) + } else { + taintsData, err := json.Marshal(newTaints) + ExpectNoError(err) + node.Annotations[api.TaintsAnnotationKey] = string(taintsData) + } - taintsData, err := json.Marshal(newTaints) - ExpectNoError(err) - node.Annotations[api.TaintsAnnotationKey] = string(taintsData) _, err = c.Core().Nodes().Update(node) if err != nil { if !apierrs.IsConflict(err) {