Skip to content

Commit c9faac2

Browse files
fix e2e resource leak when ginkgo exit before clear resource (#9103)
1 parent 93df796 commit c9faac2

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

test/e2e/framework/framework.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,9 @@ func (f *Framework) CreateEnvironment() {
121121
}
122122

123123
func (f *Framework) DestroyEnvironment() {
124-
go func() {
125-
defer ginkgo.GinkgoRecover()
126-
err := DeleteKubeNamespace(f.KubeClientSet, f.Namespace)
127-
assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace)
128-
}()
124+
defer ginkgo.GinkgoRecover()
125+
err := DeleteKubeNamespace(f.KubeClientSet, f.Namespace)
126+
assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace)
129127
}
130128

131129
// BeforeEach gets a client and makes a namespace.
@@ -151,11 +149,9 @@ func (f *Framework) AfterEach() {
151149
defer f.DestroyEnvironment()
152150

153151
defer func(kubeClient kubernetes.Interface, ingressclass string) {
154-
go func() {
155-
defer ginkgo.GinkgoRecover()
156-
err := deleteIngressClass(kubeClient, ingressclass)
157-
assert.Nil(ginkgo.GinkgoT(), err, "deleting IngressClass")
158-
}()
152+
defer ginkgo.GinkgoRecover()
153+
err := deleteIngressClass(kubeClient, ingressclass)
154+
assert.Nil(ginkgo.GinkgoT(), err, "deleting IngressClass")
159155
}(f.KubeClientSet, f.IngressClass)
160156

161157
if !ginkgo.CurrentSpecReport().Failed() {

0 commit comments

Comments
 (0)