Fix TCP Policy deletion when policy is already deleted

mohamed-essam · mohamed-essam · commit 79fdea918088 · 2025-03-06T15:04:23.000+02:00
diff --git a/internal/controller/nbpolicy_controller.go b/internal/controller/nbpolicy_controller.go
@@ -323,7 +323,7 @@ func (r *NBPolicyReconciler) syncPolicy(ctx context.Context, nbPolicy *netbirdio
 func (r *NBPolicyReconciler) handleDelete(ctx context.Context, nbPolicy netbirdiov1.NBPolicy, logger logr.Logger) error {
 	if nbPolicy.Status.TCPPolicyID != nil {
 		err := r.netbird.Policies.Delete(ctx, *nbPolicy.Status.TCPPolicyID)
-		if err != nil {
+		if err != nil && !strings.Contains("not found", err.Error()) {
 			return err
 		}
 		nbPolicy.Status.TCPPolicyID = nil

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ func (r NBPolicyReconciler) syncPolicy(ctx context.Context, nbPolicy netbirdio`
`323`	`323`	`func (r *NBPolicyReconciler) handleDelete(ctx context.Context, nbPolicy netbirdiov1.NBPolicy, logger logr.Logger) error {`
`324`	`324`	`if nbPolicy.Status.TCPPolicyID != nil {`
`325`	`325`	`err := r.netbird.Policies.Delete(ctx, *nbPolicy.Status.TCPPolicyID)`
`326`		`- if err != nil {`
	`326`	`+ if err != nil && !strings.Contains("not found", err.Error()) {`
`327`	`327`	`return err`
`328`	`328`	`}`
`329`	`329`	`nbPolicy.Status.TCPPolicyID = nil`