fixup! Use Patch instead of Update for finalizer operations

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

internal/catalogd/controllers/core/clustercatalog_controller.go

@@ -157,7 +157,7 @@ func (r *ClusterCatalogReconciler) reconcile(ctx context.Context, catalog *ocv1.
 
 		// Remove the fbcDeletionFinalizer as we do not want a finalizer attached to the catalog
 		// when it is disabled. Because the finalizer serves no purpose now.
-		if _, err := finalizerutil.UpdateFinalizers(ctx, clusterCatalogFinalizerOwner, r.Client, catalog); err != nil {
+		if _, err := finalizerutil.EnsureFinalizers(ctx, clusterCatalogFinalizerOwner, r.Client, catalog); err != nil {
 			return ctrl.Result{}, fmt.Errorf("error removing finalizer: %v", err)
 		}
 
@@ -173,7 +173,7 @@ func (r *ClusterCatalogReconciler) reconcile(ctx context.Context, catalog *ocv1.
 		if err := r.deleteCatalogCache(ctx, catalog); err != nil {
 			return ctrl.Result{}, fmt.Errorf("finalizer %q failed: %w", fbcDeletionFinalizer, err)
 		}
-		if _, err := finalizerutil.UpdateFinalizers(ctx, clusterCatalogFinalizerOwner, r.Client, catalog); err != nil {
+		if _, err := finalizerutil.EnsureFinalizers(ctx, clusterCatalogFinalizerOwner, r.Client, catalog); err != nil {
 			return ctrl.Result{}, fmt.Errorf("error removing finalizer: %v", err)
 		}
 		// Update status to reflect that catalog is no longer serving
@@ -182,7 +182,7 @@ func (r *ClusterCatalogReconciler) reconcile(ctx context.Context, catalog *ocv1.
 	}
 
 	// Add finalizer
-	finalizerAdded, err := finalizerutil.UpdateFinalizers(ctx, clusterCatalogFinalizerOwner, r.Client, catalog, fbcDeletionFinalizer)
+	finalizerAdded, err := finalizerutil.EnsureFinalizers(ctx, clusterCatalogFinalizerOwner, r.Client, catalog, fbcDeletionFinalizer)
 	if err != nil {
 		return ctrl.Result{}, fmt.Errorf("error ensuring finalizer: %v", err)
 	}

internal/operator-controller/controllers/clusterextension_controller.go

@@ -191,7 +191,7 @@ func (r *ClusterExtensionReconciler) handleDeletion(ctx context.Context, ext *oc
 	}
 	// Remove all finalizers in a single patch operation
 	if removeFinalizers {
-		if _, err := finalizerutil.UpdateFinalizers(ctx, clusterExtensionFinalizerOwner, r.Client, ext); err != nil {
+		if _, err := finalizerutil.EnsureFinalizers(ctx, clusterExtensionFinalizerOwner, r.Client, ext); err != nil {
 			setStatusProgressing(ext, err)
 			return ctrl.Result{}, fmt.Errorf("error removing finalizers: %v", err)
 		}
@@ -217,7 +217,7 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1.Cl
 		finalizers = append(finalizers, finalizerKey)
 	}
 	if len(finalizers) > 0 {
-		if _, err := finalizerutil.UpdateFinalizers(ctx, clusterExtensionFinalizerOwner, r.Client, ext, finalizers...); err != nil {
+		if _, err := finalizerutil.EnsureFinalizers(ctx, clusterExtensionFinalizerOwner, r.Client, ext, finalizers...); err != nil {
 			setStatusProgressing(ext, err)
 			return ctrl.Result{}, fmt.Errorf("error ensuring finalizers: %v", err)
 		}

internal/operator-controller/controllers/clusterextensionrevision_controller.go

@@ -133,7 +133,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 	//
 	// Reconcile
 	//
-	if _, err := finalizerutil.UpdateFinalizers(ctx, cluserExtensionRevisionFinalizerOwner, c.Client, rev, clusterExtensionRevisionTeardownFinalizer); err != nil {
+	if _, err := finalizerutil.EnsureFinalizers(ctx, cluserExtensionRevisionFinalizerOwner, c.Client, rev, clusterExtensionRevisionTeardownFinalizer); err != nil {
 		meta.SetStatusCondition(&rev.Status.Conditions, metav1.Condition{
 			Type:               ocv1.ClusterExtensionRevisionTypeAvailable,
 			Status:             metav1.ConditionFalse,
@@ -368,7 +368,7 @@ func (c *ClusterExtensionRevisionReconciler) teardown(ctx context.Context, rev *
 		return ctrl.Result{}, nil
 	}
 
-	if _, err := finalizerutil.UpdateFinalizers(ctx, cluserExtensionRevisionFinalizerOwner, c.Client, rev); err != nil {
+	if _, err := finalizerutil.EnsureFinalizers(ctx, cluserExtensionRevisionFinalizerOwner, c.Client, rev); err != nil {
 		return ctrl.Result{}, fmt.Errorf("error removing teardown finalizer: %v", err)
 	}
 	return ctrl.Result{}, nil

internal/shared/util/finalizer/finalizer.go

@@ -32,12 +32,12 @@ const (
 	FinalizerPrefix = "olm.operatorframework.io/"
 )
 
-// UpdateFinalizers sets the finalizers on an object to exactly the provided list using server-side apply.
+// EnsureFinalizers sets the finalizers on an object to exactly the provided list using server-side apply.
 // If no finalizers are supplied, all finalizers will be removed from the object.
 // If one finalizer is supplied, all other finalizers will be removed and only the supplied one will remain.
 // Returns (true, nil) if the finalizers were changed, (false, nil) if they were already set to the desired value.
 // Note: This function will update the passed object with the server response.
-func UpdateFinalizers(ctx context.Context, owner string, c client.Client, obj client.Object, finalizers ...string) (bool, error) {
+func EnsureFinalizers(ctx context.Context, owner string, c client.Client, obj client.Object, finalizers ...string) (bool, error) {
 	// Sort the desired finalizers for consistent ordering
 	newFinalizers := slices.Clone(finalizers)
 	if newFinalizers == nil {