rebase with main for new error class name

move some failure states in loadbalancer function

Author: qeqar

controllers/openstackcluster_controller.go

@@ -271,7 +271,7 @@ func deleteBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStac
 
 	if openStackCluster.Status.Bastion != nil && openStackCluster.Status.Bastion.FloatingIP != "" {
 		if err = networkingService.DeleteFloatingIP(openStackCluster, openStackCluster.Status.Bastion.FloatingIP); err != nil {
-			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete floating IP: %w", err))
+			handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete floating IP: %w", err), false)
 			return fmt.Errorf("failed to delete floating IP: %w", err)
 		}
 	}
@@ -330,7 +330,7 @@ func deleteBastion(scope *scope.WithLogger, cluster *clusterv1.Cluster, openStac
 		}
 		for _, port := range bastionStatus.Resources.Ports {
 			if err := networkingService.DeleteInstanceTrunkAndPort(openStackCluster, port, trunkSupported); err != nil {
-				handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete port: %w", err))
+				handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to delete port: %w", err), false)
 				return fmt.Errorf("failed to delete port: %w", err)
 			}
 		}
@@ -644,7 +644,7 @@ func resolveLoadBalancerNetwork(openStackCluster *infrav1.OpenStackCluster, netw
 		if lbSpec.Network != nil {
 			lbNet, err := networkingService.GetNetworkByParam(lbSpec.Network)
 			if err != nil {
-				if errors.Is(err, capoerrors.ErrMultipleMatches) || errors.Is(err, networking.ErrNoMatches) {
+				if errors.Is(err, capoerrors.ErrFilterMatch) {
 					handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to find loadbalancer network: %w", err), true)
 				}
 				return fmt.Errorf("failed to find network: %w", err)
@@ -817,11 +817,7 @@ func reconcileControlPlaneEndpoint(scope *scope.WithLogger, networkingService *n
 
 		terminalFailure, err := loadBalancerService.ReconcileLoadBalancer(openStackCluster, clusterResourceName, apiServerPort)
 		if err != nil {
-			// if it's terminalFailure (not Transient), set the Failure reason and message
-			if terminalFailure {
-				handleUpdateOSCError(openStackCluster, fmt.Errorf("failed to reconcile load balancer: %w", err), true)
-			}
-			return fmt.Errorf("failed to reconcile load balancer: %w", err)
+			return fmt.Errorf("failed to reconcile load balancer: %w", err, terminalFailure)
 		}
 
 		// Control plane endpoint is the floating IP if one was defined, otherwise the VIP address

pkg/cloud/services/loadbalancer/loadbalancer.go

@@ -82,7 +82,11 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 
 	lb, err := s.getOrCreateAPILoadBalancer(openStackCluster, clusterResourceName)
 	if err != nil {
-		return false, err
+		if errors.Is(capoerrors.ErrFilterMatch, err) {
+			return true, err
+		} else {
+			return false, err
+		}
 	}
 
 	lbStatus.Name = lb.Name
@@ -107,7 +111,11 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 
 		fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster, clusterResourceName, floatingIPAddress)
 		if err != nil {
-			return false, err
+			if errors.Is(capoerrors.ErrFilterMatch, err) {
+				return true, err
+			} else {
+				return false, err
+			}
 		}
 
 		// Write the floating IP to the status immediately so we won't