diff --git a/internal/controllers/floatingip/suite_test.go b/internal/controllers/floatingip/suite_test.go index f1a7eb8fa..706b46ee7 100644 --- a/internal/controllers/floatingip/suite_test.go +++ b/internal/controllers/floatingip/suite_test.go @@ -86,9 +86,6 @@ var _ = Describe("EnvTest sanity check", func() { // Create the namespace Expect(k8sClient.Create(ctx, namespace)).To(Succeed(), "create namespace") - DeferCleanup(func() { - Expect(k8sClient.Delete(ctx, namespace)).To(Succeed(), "delete namespace") - }) // Check the result namespaceResult := &corev1.Namespace{} diff --git a/internal/controllers/image/suite_test.go b/internal/controllers/image/suite_test.go index 4b1fa4de2..63de7576e 100644 --- a/internal/controllers/image/suite_test.go +++ b/internal/controllers/image/suite_test.go @@ -86,9 +86,6 @@ var _ = Describe("EnvTest sanity check", func() { // Create the namespace Expect(k8sClient.Create(ctx, namespace)).To(Succeed(), "create namespace") - DeferCleanup(func() { - Expect(k8sClient.Delete(ctx, namespace)).To(Succeed(), "delete namespace") - }) // Check the result namespaceResult := &corev1.Namespace{} diff --git a/internal/controllers/image/upload_test.go b/internal/controllers/image/upload_test.go index cfdb2a5f5..a703f07f2 100644 --- a/internal/controllers/image/upload_test.go +++ b/internal/controllers/image/upload_test.go @@ -160,9 +160,6 @@ var _ = Describe("Upload tests", Ordered, func() { namespace = &corev1.Namespace{} namespace.SetGenerateName("test-") Expect(k8sClient.Create(ctx, namespace)).To(Succeed(), "create namespace") - DeferCleanup(func() { - Expect(k8sClient.Delete(ctx, namespace)).To(Succeed(), "delete namespace") - }) mockCtrl = gomock.NewController(GinkgoT()) actuator = &imageActuator{ diff --git a/internal/controllers/router/suite_test.go b/internal/controllers/router/suite_test.go index 02433215f..c852871d8 100644 --- a/internal/controllers/router/suite_test.go +++ b/internal/controllers/router/suite_test.go @@ -86,9 +86,6 @@ var _ = Describe("EnvTest sanity check", func() { // Create the namespace Expect(k8sClient.Create(ctx, namespace)).To(Succeed(), "create namespace") - DeferCleanup(func() { - Expect(k8sClient.Delete(ctx, namespace)).To(Succeed(), "delete namespace") - }) // Check the result namespaceResult := &corev1.Namespace{} diff --git a/internal/controllers/routerinterface/suite_test.go b/internal/controllers/routerinterface/suite_test.go index 8c93ac434..6c7d7cb26 100644 --- a/internal/controllers/routerinterface/suite_test.go +++ b/internal/controllers/routerinterface/suite_test.go @@ -86,9 +86,6 @@ var _ = Describe("EnvTest sanity check", func() { // Create the namespace Expect(k8sClient.Create(ctx, namespace)).To(Succeed(), "create namespace") - DeferCleanup(func() { - Expect(k8sClient.Delete(ctx, namespace)).To(Succeed(), "delete namespace") - }) // Check the result namespaceResult := &corev1.Namespace{} diff --git a/internal/controllers/subnet/suite_test.go b/internal/controllers/subnet/suite_test.go index 847b93590..9bb667a55 100644 --- a/internal/controllers/subnet/suite_test.go +++ b/internal/controllers/subnet/suite_test.go @@ -86,9 +86,6 @@ var _ = Describe("EnvTest sanity check", func() { // Create the namespace Expect(k8sClient.Create(ctx, namespace)).To(Succeed(), "create namespace") - DeferCleanup(func() { - Expect(k8sClient.Delete(ctx, namespace)).To(Succeed(), "delete namespace") - }) // Check the result namespaceResult := &corev1.Namespace{} diff --git a/test/apivalidations/suite_test.go b/test/apivalidations/suite_test.go index 595c4a95f..7c11a73cf 100644 --- a/test/apivalidations/suite_test.go +++ b/test/apivalidations/suite_test.go @@ -27,7 +27,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/discovery" @@ -149,10 +148,6 @@ func createNamespace() *corev1.Namespace { namespace := corev1.Namespace{} namespace.GenerateName = "test-" Expect(k8sClient.Create(ctx, &namespace)).To(Succeed(), "Namespace creation should succeed") - DeferCleanup(func() { - By("Deleting namespace") - Expect(k8sClient.Delete(ctx, &namespace, client.PropagationPolicy(metav1.DeletePropagationForeground))).To(Succeed(), "Namespace deletion should succeed") - }) By(fmt.Sprintf("Using namespace %s", namespace.Name)) return &namespace }