Merge pull request #69944 from jingxu97/defertest

test/e2e/storage/utils/utils.go

@@ -220,13 +220,13 @@ func TestVolumeUnmountsFromDeletedPodWithForceOption(c clientset.Interface, f *f
 		Expect(result.Code).To(BeZero(), fmt.Sprintf("Expected grep exit code of 0, got %d", result.Code))
 	}
 
-	By("Stopping the kubelet.")
-	KubeletCommand(KStop, c, clientPod)
+	// This command is to make sure kubelet is started after test finishes no matter it fails or not.
 	defer func() {
-		if err != nil {
-			KubeletCommand(KStart, c, clientPod)
-		}
+		KubeletCommand(KStart, c, clientPod)
 	}()
+	By("Stopping the kubelet.")
+	KubeletCommand(KStop, c, clientPod)
+
 	By(fmt.Sprintf("Deleting Pod %q", clientPod.Name))
 	if forceDelete {
 		err = c.CoreV1().Pods(clientPod.Namespace).Delete(clientPod.Name, metav1.NewDeleteOptions(0))