Merge pull request #39 from GDATASoftwareAG/delete_mchines

Mattes83 · web-flow · commit 469179cafdf2 · 2023-11-15T11:25:25.000+01:00
Fix deletion of machines without id
diff --git a/internal/controller/ionoscloudmachine_controller.go b/internal/controller/ionoscloudmachine_controller.go
@@ -189,8 +189,8 @@ func (r *IONOSCloudMachineReconciler) reconcileDelete(ctx *context.MachineContex
 		}
 
 		conditions.MarkFalse(ctx.IONOSCloudCluster, v1alpha1.ServerCreatedCondition, "ServerDeleted", clusterv1.ConditionSeverityInfo, "")
-		ctrlutil.RemoveFinalizer(ctx.IONOSCloudMachine, v1alpha1.MachineFinalizer)
 	}
+	ctrlutil.RemoveFinalizer(ctx.IONOSCloudMachine, v1alpha1.MachineFinalizer)
 
 	return reconcile.Result{}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -189,8 +189,8 @@ func (r IONOSCloudMachineReconciler) reconcileDelete(ctx context.MachineContex`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`conditions.MarkFalse(ctx.IONOSCloudCluster, v1alpha1.ServerCreatedCondition, "ServerDeleted", clusterv1.ConditionSeverityInfo, "")`
`192`		`- ctrlutil.RemoveFinalizer(ctx.IONOSCloudMachine, v1alpha1.MachineFinalizer)`
`193`	`192`	`}`
	`193`	`+ ctrlutil.RemoveFinalizer(ctx.IONOSCloudMachine, v1alpha1.MachineFinalizer)`
`194`	`194`
`195`	`195`	`return reconcile.Result{}, nil`
`196`	`196`	`}`