fix: update patch to use DefaultBackoff

using DefaultBackoff rather than DefaultRetry should result in fewer conflicts with other controllers
in addition, we also change removeFinalizer() to use our patch function.

controllers/routingctrl/delete_resources.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/opendatahub-io/odh-platform/pkg/metadata/labels"
 	"github.com/opendatahub-io/odh-platform/pkg/routing"
+	"github.com/opendatahub-io/odh-platform/pkg/unstruct"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	k8slabels "k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -90,8 +91,9 @@ func removeFinalizer(ctx context.Context, cli client.Client, sourceRes *unstruct
 	if controllerutil.ContainsFinalizer(sourceRes, finalizerName) {
 		controllerutil.RemoveFinalizer(sourceRes, finalizerName)
 
-		if err := cli.Update(ctx, sourceRes); err != nil {
-			return fmt.Errorf("failed to remove finalizer: %w", err)
+		if err := unstruct.Patch(ctx, cli, sourceRes); err != nil {
+			return fmt.Errorf("failed to remove finalizer patching resource %s/%s: %w",
+				sourceRes.GetNamespace(), sourceRes.GetName(), err)
 		}
 	}
 

pkg/unstruct/funcs.go

@@ -66,7 +66,7 @@ func IsMarkedForDeletion(target *unstructured.Unstructured) bool {
 // Patch updates the specified Kubernetes resource by applying changes from the provided target object.
 // In case of conflicts, it will retry using default strategy.
 func Patch(ctx context.Context, cli client.Client, target *unstructured.Unstructured) error {
-	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+	err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
 		currentRes := &unstructured.Unstructured{}
 		currentRes.SetGroupVersionKind(target.GroupVersionKind())