Add ip address claims deletion test

Author: SzymonSAP

internal/controller/ironcoremetalmachine_controller.go

@@ -187,14 +187,17 @@ func (r *IroncoreMetalMachineReconciler) reconcileDelete(ctx context.Context, ma
 
 	ipList := &capiv1beta1.IPAddressClaimList{}
 	if err := r.Client.List(ctx, ipList, client.InNamespace(machineScope.IroncoreMetalMachine.Namespace)); meta.IsNoMatchError(err) {
-		machineScope.Logger.Info(fmt.Sprintf("Kind %s not found, assuming IP objects for that kind is absent", ipList.GetObjectKind().GroupVersionKind().Kind))
+		machineScope.Logger.Info("Kind not found, assuming IP objects for that kind is absent", "kind", ipList.GetObjectKind().GroupVersionKind().Kind)
 		ipList = &capiv1beta1.IPAddressClaimList{}
 	} else if err != nil {
 		return ctrl.Result{}, fmt.Errorf("error listing ip resources: %s", err.Error())
 	}
 	for _, ip := range ipList.Items {
 		if strings.HasPrefix(ip.Name, machineScope.IroncoreMetalMachine.Name) {
-			if err := r.Client.Delete(ctx, &ip); !meta.IsNoMatchError(client.IgnoreNotFound(err)) {
+			if err := r.Client.Delete(ctx, &ip); meta.IsNoMatchError(err) {
+				machineScope.Logger.Info("Kind not found, assuming IP objects for that kind is absent", "kind", ipList.GetObjectKind().GroupVersionKind().Kind, "object", ip.Name)
+			} else if client.IgnoreNotFound(err) != nil {
+				// Unknown leads to short retry in machine controller
 				return ctrl.Result{}, fmt.Errorf("error deleting ip resource: %s", err.Error())
 			}
 		}

internal/controller/ironcoremetalmachine_controller_test.go

@@ -9,9 +9,11 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -27,7 +29,7 @@ import (
 )
 
 var _ = Describe("IroncoreMetalMachine Controller", func() {
-	When("all resources are present to create an ignition", func() {
+	When("all resources are present to reconcile", func() {
 		const namespace = "default"
 
 		var (
@@ -147,17 +149,18 @@ var _ = Describe("IroncoreMetalMachine Controller", func() {
 			Expect(k8sClient.Delete(ctx, metalCluster)).To(Succeed())
 			Expect(k8sClient.Delete(ctx, cluster)).To(Succeed())
 			Expect(k8sClient.Delete(ctx, machine)).To(Succeed())
-			Expect(get(metalMachine)).To(Succeed())
-			Expect(clientutils.PatchRemoveFinalizer(ctx, k8sClient, metalMachine, IroncoreMetalMachineFinalizer)).To(Succeed())
-			Expect(k8sClient.Delete(ctx, metalMachine)).To(Succeed())
+			if err := get(metalMachine); err == nil {
+				Expect(clientutils.PatchRemoveFinalizer(ctx, k8sClient, metalMachine, IroncoreMetalMachineFinalizer)).To(Succeed())
+				Expect(k8sClient.Delete(ctx, metalMachine)).To(Succeed())
 
-			serverClaim := &metalv1alpha1.ServerClaim{}
-			Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(metalMachine), serverClaim)).To(Succeed())
-			Expect(k8sClient.Delete(ctx, serverClaim)).To(Succeed())
+				serverClaim := &metalv1alpha1.ServerClaim{}
+				Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(metalMachine), serverClaim)).To(Succeed())
+				Expect(k8sClient.Delete(ctx, serverClaim)).To(Succeed())
 
-			metalSecret := &corev1.Secret{}
-			Expect(k8sClient.Get(ctx, metalSecretNN, metalSecret)).To(Succeed())
-			Expect(k8sClient.Delete(ctx, metalSecret)).To(Succeed())
+				metalSecret := &corev1.Secret{}
+				Expect(k8sClient.Get(ctx, metalSecretNN, metalSecret)).To(Succeed())
+				Expect(k8sClient.Delete(ctx, metalSecret)).To(Succeed())
+			}
 		})
 
 		It("should create the ignition secret", func() {
@@ -264,5 +267,33 @@ var _ = Describe("IroncoreMetalMachine Controller", func() {
 				})
 			})
 		})
+
+		When("deletion timestamp is set", func() {
+			It("should delete the ip address claims", func() {
+				Expect(k8sClient.Delete(ctx, metalMachine)).To(Succeed())
+				ipAddressClaim1 := &capiv1beta1.IPAddressClaim{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      fmt.Sprintf("%s-1", metalMachine.Name),
+						Namespace: namespace,
+					},
+				}
+				Expect(k8sClient.Create(ctx, ipAddressClaim1)).To(Succeed())
+				ipAddressClaim2 := &capiv1beta1.IPAddressClaim{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      fmt.Sprintf("%s-2", metalMachine.Name),
+						Namespace: namespace,
+					},
+				}
+				Expect(k8sClient.Create(ctx, ipAddressClaim2)).To(Succeed())
+
+				_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
+					NamespacedName: client.ObjectKeyFromObject(metalMachine),
+				})
+				Expect(err).NotTo(HaveOccurred())
+
+				Eventually(Get(ipAddressClaim1)).Should(Satisfy(apierrors.IsNotFound))
+				Eventually(Get(ipAddressClaim2)).Should(Satisfy(apierrors.IsNotFound))
+			})
+		})
 	})
 })

internal/controller/suite_test.go

@@ -12,6 +12,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 
 	infrav1alpha1 "github.com/ironcore-dev/cluster-api-provider-ironcore-metal/api/v1alpha1"
 	"github.com/ironcore-dev/controller-utils/modutils"
@@ -90,6 +91,8 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
 
+	// set komega client
+	SetClient(k8sClient)
 })
 
 var _ = AfterSuite(func() {