From 080d4a2a9bf374739e08dfbc5684e2b9c514d4f3 Mon Sep 17 00:00:00 2001 From: Shiming Zhang Date: Mon, 26 Dec 2022 13:02:23 +0800 Subject: [PATCH] Fix this e2e failure causing Kubelet not to restart --- test/e2e/storage/non_graceful_node_shutdown.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/e2e/storage/non_graceful_node_shutdown.go b/test/e2e/storage/non_graceful_node_shutdown.go index 41e5bfb09fd..08c6b246935 100644 --- a/test/e2e/storage/non_graceful_node_shutdown.go +++ b/test/e2e/storage/non_graceful_node_shutdown.go @@ -102,6 +102,7 @@ var _ = utils.SIGDescribe("[Feature:NodeOutOfServiceVolumeDetach] [Disruptive] [ ginkgo.By("Stopping the kubelet non gracefully for pod" + pod.Name) utils.KubeletCommand(ctx, utils.KStop, c, pod) + ginkgo.DeferCleanup(utils.KubeletCommand, utils.KStart, c, pod) ginkgo.By("Adding out of service taint on node " + oldNodeName) // taint this node as out-of-service node @@ -110,6 +111,7 @@ var _ = utils.SIGDescribe("[Feature:NodeOutOfServiceVolumeDetach] [Disruptive] [ Effect: v1.TaintEffectNoExecute, } e2enode.AddOrUpdateTaintOnNode(ctx, c, oldNodeName, taint) + ginkgo.DeferCleanup(e2enode.RemoveTaintOffNode, c, oldNodeName, taint) ginkgo.By(fmt.Sprintf("Checking if the pod %s got rescheduled to a new node", pod.Name)) labelSelectorStr := labels.SelectorFromSet(podLabels).String()