Fix bug, could delete subnetset when there are still stale subnetport…

…s left

When there are stale subnetports in one subnet of subnetset, we should not allow
deleting it.

Signed-off-by: Xie Zheng <xizheng@vmware.com>

pkg/controllers/subnetset/subnetset_controller.go

@@ -111,11 +111,18 @@ func (r *SubnetSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	} else {
 		if controllerutil.ContainsFinalizer(obj, servicecommon.SubnetSetFinalizerName) {
 			metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteTotal, MetricResTypeSubnetSet)
-			if err := r.DeleteSubnetForSubnetSet(*obj, false); err != nil {
+			hasStaleSubnetPorts, err := r.DeleteSubnetForSubnetSet(*obj, false)
+			if err != nil {
 				log.Error(err, "deletion failed, would retry exponentially", "subnetset", req.NamespacedName)
 				deleteFail(r, &ctx, obj, "")
 				return ResultRequeue, err
 			}
+			if hasStaleSubnetPorts {
+				err := fmt.Errorf("stale subnet ports found while deleting subnetset %v", req.NamespacedName)
+				log.Error(err, "deletion failed, delete all the subnetports first", "subnetset", req.NamespacedName)
+				updateFail(r, &ctx, obj, err.Error())
+				return ResultNormal, nil
+			}
 			controllerutil.RemoveFinalizer(obj, servicecommon.SubnetSetFinalizerName)
 			if err := r.Client.Update(ctx, obj); err != nil {
 				log.Error(err, "deletion failed, would retry exponentially", "subnetset", req.NamespacedName)
@@ -260,7 +267,7 @@ func (r *SubnetSetReconciler) CollectGarbage(ctx context.Context) {
 
 	subnetSetIDs := sets.New[string]()
 	for _, subnetSet := range subnetSetList.Items {
-		if err := r.DeleteSubnetForSubnetSet(subnetSet, true); err != nil {
+		if _, err := r.DeleteSubnetForSubnetSet(subnetSet, true); err != nil {
 			metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteFailTotal, MetricResTypeSubnetSet)
 		} else {
 			metrics.CounterInc(r.SubnetService.NSXConfig, metrics.ControllerDeleteSuccessTotal, MetricResTypeSubnetSet)
@@ -279,12 +286,14 @@ func (r *SubnetSetReconciler) CollectGarbage(ctx context.Context) {
 	}
 }
 
-func (r *SubnetSetReconciler) DeleteSubnetForSubnetSet(obj v1alpha1.SubnetSet, updataStatus bool) error {
+func (r *SubnetSetReconciler) DeleteSubnetForSubnetSet(obj v1alpha1.SubnetSet, updataStatus bool) (bool, error) {
 	nsxSubnets := r.SubnetService.SubnetStore.GetByIndex(servicecommon.TagScopeSubnetSetCRUID, string(obj.GetUID()))
 	hitError := false
+	hasStaleSubnetPorts := false
 	for _, subnet := range nsxSubnets {
 		portNums := len(r.SubnetPortService.GetPortsOfSubnet(*subnet.Id))
 		if portNums > 0 {
+			hasStaleSubnetPorts = true
 			continue
 		}
 		if err := r.SubnetService.DeleteSubnet(*subnet); err != nil {
@@ -295,13 +304,13 @@ func (r *SubnetSetReconciler) DeleteSubnetForSubnetSet(obj v1alpha1.SubnetSet, u
 	}
 	if updataStatus {
 		if err := r.SubnetService.UpdateSubnetSetStatus(&obj); err != nil {
-			return err
+			return hasStaleSubnetPorts, err
 		}
 	}
 	if hitError {
-		return errors.New("error occurs when deleting subnet")
+		return hasStaleSubnetPorts, errors.New("error occurs when deleting subnet")
 	}
-	return nil
+	return hasStaleSubnetPorts, nil
 }
 
 func StartSubnetSetController(mgr ctrl.Manager, subnetService *subnet.SubnetService,