Merge pull request #1680 from shiftstack/cluster-port-deletion

🐛 Only delete all ports when deleting cluster network

controllers/openstackcluster_controller.go

@@ -155,11 +155,6 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
 
 	clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
 
-	if err = networkingService.DeletePorts(openStackCluster); err != nil {
-		handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete ports: %w", err))
-		return reconcile.Result{}, fmt.Errorf("failed to delete ports: %w", err)
-	}
-
 	if openStackCluster.Spec.APIServerLoadBalancer.Enabled {
 		loadBalancerService, err := loadbalancer.NewService(scope)
 		if err != nil {
@@ -184,6 +179,11 @@ func (r *OpenStackClusterReconciler) reconcileDelete(ctx context.Context, scope
 			return ctrl.Result{}, fmt.Errorf("failed to delete router: %w", err)
 		}
 
+		if err = networkingService.DeletePorts(openStackCluster); err != nil {
+			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete ports: %w", err))
+			return reconcile.Result{}, fmt.Errorf("failed to delete ports: %w", err)
+		}
+
 		if err = networkingService.DeleteNetwork(openStackCluster, clusterName); err != nil {
 			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete network: %w", err))
 			return ctrl.Result{}, fmt.Errorf("failed to delete network: %w", err)