Merge pull request #589 from lmiccini/fix-frr-cleanup-error-handling

openshift-merge-bot[bot] · web-flow · commit 3f15b2f6db21 · 2026-05-27T19:09:48.000Z
Fix FRR old namespace cleanup error handling in reconcileDelete
diff --git a/internal/controller/network/bgpconfiguration_controller.go b/internal/controller/network/bgpconfiguration_controller.go
@@ -384,7 +384,7 @@ func (r *BGPConfigurationReconciler) reconcileDelete(ctx context.Context, instan
 
 	if frrNamespace != instance.Spec.FRRConfigurationNamespace {
 		if err := r.cleanupOldNamespaceFRRConfigurations(ctx, instance, instance.Spec.FRRConfigurationNamespace); err != nil {
-			Log.Error(err, "Failed to cleanup FRRConfigurations from old namespace", "namespace", instance.Spec.FRRConfigurationNamespace)
+			return ctrl.Result{}, fmt.Errorf("error cleaning up FRRConfigurations from old namespace %s: %w", instance.Spec.FRRConfigurationNamespace, err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ func (r *BGPConfigurationReconciler) reconcileDelete(ctx context.Context, instan`
`384`	`384`
`385`	`385`	`if frrNamespace != instance.Spec.FRRConfigurationNamespace {`
`386`	`386`	`if err := r.cleanupOldNamespaceFRRConfigurations(ctx, instance, instance.Spec.FRRConfigurationNamespace); err != nil {`
`387`		`- Log.Error(err, "Failed to cleanup FRRConfigurations from old namespace", "namespace", instance.Spec.FRRConfigurationNamespace)`
	`387`	`+ return ctrl.Result{}, fmt.Errorf("error cleaning up FRRConfigurations from old namespace %s: %w", instance.Spec.FRRConfigurationNamespace, err)`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`