Ensure cleanup in all webhook tests

Author: afritzler

internal/webhook/v1alpha1/biosversion_webhook_test.go

@@ -191,4 +191,5 @@ var _ = Describe("BIOSVersion Webhook", func() {
 			biosVersionV1.Status.State = metalv1alpha1.BIOSVersionStateCompleted
 		})).Should(Succeed())
 	})
+
 })

internal/webhook/v1alpha1/bmcsettings_webhook_test.go

@@ -6,6 +6,7 @@ package v1alpha1
 import (
 	"fmt"
 
+	"github.com/ironcore-dev/metal-operator/internal/controller"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
@@ -36,12 +37,19 @@ var _ = Describe("BMCSettings Webhook", func() {
 		}
 		By("Creating an BMCSettings")
 		Expect(k8sClient.Create(ctx, BMCSettingsV1)).To(Succeed())
-		DeferCleanup(k8sClient.Delete, BMCSettingsV1)
 		validator = BMCSettingsCustomValidator{Client: k8sClient}
 		SetClient(k8sClient)
 
 	})
 
+	AfterEach(func() {
+		By("Deleting BMCSettings")
+		Expect(k8sClient.DeleteAllOf(ctx, &metalv1alpha1.BMCSettings{})).To(Succeed())
+
+		By("Ensuring clean state")
+		controller.EnsureCleanState()
+	})
+
 	Context("When creating or updating BMCSettings under Validating Webhook", func() {
 
 		It("Should deny creation if a BMC referred is already referred by another", func(ctx SpecContext) {
@@ -76,7 +84,6 @@ var _ = Describe("BMCSettings Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, BMCSettingsV2)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, BMCSettingsV2)
 		})
 
 		It("Should deny Update if a BMC referred is already referred by another", func() {
@@ -94,7 +101,6 @@ var _ = Describe("BMCSettings Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, BMCSettingsV2)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, BMCSettingsV2)
 
 			By("Updating an BMCSettingsV2 to refer to existing BMC")
 			BMCSettingsV2Updated := BMCSettingsV2.DeepCopy()
@@ -117,7 +123,6 @@ var _ = Describe("BMCSettings Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, BMCSettingsV2)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, BMCSettingsV2)
 
 			By("Updating an BMCSettingsV2 to refer to new BMC")
 			BMCSettingsV2Updated := BMCSettingsV2.DeepCopy()
@@ -161,8 +166,6 @@ var _ = Describe("BMCSettings Webhook", func() {
 			Eventually(UpdateStatus(BMCSettingsV1, func() {
 				BMCSettingsV1.Status.State = metalv1alpha1.BMCSettingsStateApplied
 			})).Should(Succeed())
-
-			By("Deleting the BMCSettings should pass: by DeferCleanup")
 		})
 	})
 })

internal/webhook/v1alpha1/bmcversion_webhook_test.go

@@ -6,6 +6,7 @@ package v1alpha1
 import (
 	"fmt"
 
+	"github.com/ironcore-dev/metal-operator/internal/controller"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
@@ -39,13 +40,16 @@ var _ = Describe("BMCVersion Webhook", func() {
 		}
 		By("Creating an BMCVersion")
 		Expect(k8sClient.Create(ctx, BMCVersionV1)).To(Succeed())
-		DeferCleanup(k8sClient.Delete, BMCVersionV1)
 		SetClient(k8sClient)
 
 	})
 
 	AfterEach(func() {
-		// TODO (user): Add any teardown logic common to all tests
+		By("Deleting BMCVersion")
+		Expect(k8sClient.DeleteAllOf(ctx, &metalv1alpha1.BMCVersion{})).To(Succeed())
+
+		By("Ensuring clean state")
+		controller.EnsureCleanState()
 	})
 
 	Context("When creating or updating BMCVersion under Validating Webhook", func() {
@@ -85,7 +89,6 @@ var _ = Describe("BMCVersion Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, BMCVersionV2)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, BMCVersionV2)
 		})
 
 		It("Should deny Update if a BMC referred is already referred by another", func() {
@@ -105,7 +108,6 @@ var _ = Describe("BMCVersion Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, BMCVersionV2)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, BMCVersionV2)
 
 			By("Updating an BMCVersionV2 to refer to existing BMC")
 			BMCVersionV2Updated := BMCVersionV2.DeepCopy()
@@ -130,7 +132,6 @@ var _ = Describe("BMCVersion Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, BMCVersionV2)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, BMCVersionV2)
 
 			By("Updating an BMCVersionV2 to refer to new BMC")
 			BMCVersionV2Updated := BMCVersionV2.DeepCopy()
@@ -172,9 +173,6 @@ var _ = Describe("BMCVersion Webhook", func() {
 			Eventually(UpdateStatus(BMCVersionV1, func() {
 				BMCVersionV1.Status.State = metalv1alpha1.BMCVersionStateCompleted
 			})).Should(Succeed())
-
-			By("Deleting the BMCVersionV1 should pass: by DeferCleanup")
 		})
 	})
-
 })

internal/webhook/v1alpha1/endpoint_webhook_test.go

@@ -4,6 +4,7 @@
 package v1alpha1
 
 import (
+	"github.com/ironcore-dev/metal-operator/internal/controller"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,6 +30,14 @@ var _ = Describe("Endpoint Webhook", func() {
 		Expect(obj).NotTo(BeNil(), "Expected obj to be initialized")
 	})
 
+	AfterEach(func() {
+		By("Deleting the Endpoint")
+		Expect(k8sClient.DeleteAllOf(ctx, &metalv1alpha1.Endpoint{})).To(Succeed())
+
+		By("Ensuring clean state")
+		controller.EnsureCleanState()
+	})
+
 	Context("When creating or updating an Endpoint under Validating Webhook", func() {
 		It("Should deny creation if an Endpoint has a duplicate MAC address", func(ctx SpecContext) {
 			By("Creating an Endpoint")
@@ -42,7 +51,6 @@ var _ = Describe("Endpoint Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, endpoint)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, endpoint)
 
 			By("Creating an Endpoint with existing MAC address")
 			existingEndpoint := &metalv1alpha1.Endpoint{
@@ -69,7 +77,6 @@ var _ = Describe("Endpoint Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, endpoint)).ToNot(HaveOccurred())
-			DeferCleanup(k8sClient.Delete, endpoint)
 
 			By("Creating an Endpoint with non-existing MAC address")
 			existingEndpoint := &metalv1alpha1.Endpoint{
@@ -96,7 +103,6 @@ var _ = Describe("Endpoint Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, endpoint)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, endpoint)
 
 			By("Creating an Endpoint with different MAC address")
 			existingEndpoint := &metalv1alpha1.Endpoint{
@@ -109,7 +115,6 @@ var _ = Describe("Endpoint Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, existingEndpoint)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, existingEndpoint)
 
 			By("Updating an Endpoint to conflicting MAC address")
 			updatedEndpoint := endpoint.DeepCopy()
@@ -129,7 +134,6 @@ var _ = Describe("Endpoint Webhook", func() {
 				},
 			}
 			Expect(k8sClient.Create(ctx, existingEndpoint)).To(Succeed())
-			DeferCleanup(k8sClient.Delete, existingEndpoint)
 
 			By("Updating an Endpoint IP address")
 			updatedEndpoint := existingEndpoint.DeepCopy()

internal/webhook/v1alpha1/server_webhook_test.go

@@ -4,6 +4,8 @@
 package v1alpha1
 
 import (
+	"context"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,21 +38,25 @@ var _ = Describe("Server Webhook", func() {
 			},
 		}
 		Expect(k8sClient.Create(ctx, server)).To(Succeed())
-		DeferCleanup(k8sClient.Delete, server)
 		validator = ServerCustomValidator{Client: k8sClient}
 		SetClient(k8sClient)
 		By("Creating an server")
 	})
 
+	AfterEach(func(ctx context.Context) {
+		By("Deleting the server")
+		Expect(k8sClient.DeleteAllOf(ctx, server)).To(Succeed())
+
+		By("Ensuring clean state")
+		controller.EnsureCleanState()
+	})
+
 	Context("When deleting Server under Validating Webhook", func() {
 		It("Should refuse to delete if in Maintenance", func() {
 			By("Patching the server to a maintenance state and adding finalizer")
 			Eventually(UpdateStatus(server, func() {
 				server.Status.State = metalv1alpha1.ServerStateMaintenance
 			})).Should(Succeed())
-			Eventually(Update(server, func() {
-				server.Finalizers = append(server.Finalizers, controller.ServerFinalizer)
-			})).Should(Succeed())
 
 			By("Deleting the Server should not pass")
 			Expect(validator.ValidateDelete(ctx, server)).Error().To(HaveOccurred())
@@ -61,9 +67,6 @@ var _ = Describe("Server Webhook", func() {
 					metalv1alpha1.OperationAnnotation: metalv1alpha1.OperationAnnotationForceUpdateOrDeleteInProgress,
 				}
 			})).Should(Succeed())
-
-			By("Deleting the server should pass: by DeferCleanup")
 		})
 	})
-
 })