DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix e2e resource leak when ginkgo exit before clear resource (#9103)

Browse source
This commit is contained in:
LR1990 2022-10-13 03:45:02 +08:00 committed by GitHub
parent 93df796767
commit c9faac2222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
test/e2e/framework/framework.go
View file

@ -121,11 +121,9 @@ func (f *Framework) CreateEnvironment() {
} }
func (f *Framework) DestroyEnvironment() { func (f *Framework) DestroyEnvironment() {
go func() { defer ginkgo.GinkgoRecover()
defer ginkgo.GinkgoRecover() err := DeleteKubeNamespace(f.KubeClientSet, f.Namespace)
err := DeleteKubeNamespace(f.KubeClientSet, f.Namespace) assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace)
assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace)
}()
} }
// BeforeEach gets a client and makes a namespace. // BeforeEach gets a client and makes a namespace.
@ -151,11 +149,9 @@ func (f *Framework) AfterEach() {
defer f.DestroyEnvironment() defer f.DestroyEnvironment()
defer func(kubeClient kubernetes.Interface, ingressclass string) { defer func(kubeClient kubernetes.Interface, ingressclass string) {
go func() { defer ginkgo.GinkgoRecover()
defer ginkgo.GinkgoRecover() err := deleteIngressClass(kubeClient, ingressclass)
err := deleteIngressClass(kubeClient, ingressclass) assert.Nil(ginkgo.GinkgoT(), err, "deleting IngressClass")
assert.Nil(ginkgo.GinkgoT(), err, "deleting IngressClass")
}()
}(f.KubeClientSet, f.IngressClass) }(f.KubeClientSet, f.IngressClass)
if !ginkgo.CurrentSpecReport().Failed() { if !ginkgo.CurrentSpecReport().Failed() {