From 42f6ad6738551517e478b01a6f4682b2e39045e5 Mon Sep 17 00:00:00 2001 From: LR1990 <52204121+loveRhythm1990@users.noreply.github.com> Date: Thu, 13 Oct 2022 03:45:02 +0800 Subject: [PATCH] fix e2e resource leak when ginkgo exit before clear resource (#9103) --- test/e2e/framework/framework.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go index 4946c13b27..662cd08795 100644 --- a/test/e2e/framework/framework.go +++ b/test/e2e/framework/framework.go @@ -121,11 +121,9 @@ func (f *Framework) CreateEnvironment() { } func (f *Framework) DestroyEnvironment() { - go func() { - defer ginkgo.GinkgoRecover() - err := DeleteKubeNamespace(f.KubeClientSet, f.Namespace) - assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace) - }() + defer ginkgo.GinkgoRecover() + err := DeleteKubeNamespace(f.KubeClientSet, f.Namespace) + assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace) } // BeforeEach gets a client and makes a namespace. @@ -151,11 +149,9 @@ func (f *Framework) AfterEach() { defer f.DestroyEnvironment() defer func(kubeClient kubernetes.Interface, ingressclass string) { - go func() { - defer ginkgo.GinkgoRecover() - err := deleteIngressClass(kubeClient, ingressclass) - assert.Nil(ginkgo.GinkgoT(), err, "deleting IngressClass") - }() + defer ginkgo.GinkgoRecover() + err := deleteIngressClass(kubeClient, ingressclass) + assert.Nil(ginkgo.GinkgoT(), err, "deleting IngressClass") }(f.KubeClientSet, f.IngressClass) if !ginkgo.CurrentSpecReport().Failed() {