fixup! Use Patch instead of Update for finalizer operations

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

Author: tmshort

internal/catalogd/controllers/core/clustercatalog_controller_test.go

@@ -662,12 +662,6 @@ func TestCatalogdControllerReconcile(t *testing.T) {
 					},
 				},
 			},
-			// Note: When the controller patches the object to remove finalizers,
-			// the fake client may update the object with a fresh copy from its storage,
-			// which can overwrite in-memory status changes made before the patch.
-			// In production, the Reconcile() method handles this by doing Status().Update()
-			// separately. Since this test calls reconcile() directly, we only verify
-			// the finalizer was removed - status updates are tested separately.
 			expectedCatalog: &ocv1.ClusterCatalog{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:       "catalog",
@@ -682,21 +676,12 @@ func TestCatalogdControllerReconcile(t *testing.T) {
 					},
 					AvailabilityMode: ocv1.AvailabilityModeUnavailable,
 				},
-				// Status fields are not checked here because the fake client's Patch operation
-				// may reset them. The status updates are properly handled in production via
-				// the separate Status().Update() call in the Reconcile() method.
 				Status: ocv1.ClusterCatalogStatus{
-					URLs:         &ocv1.ClusterCatalogURLs{Base: "URL"},
-					LastUnpacked: nil,
-					ResolvedSource: &ocv1.ResolvedCatalogSource{
-						Type:  ocv1.SourceTypeImage,
-						Image: &ocv1.ResolvedImageSource{},
-					},
 					Conditions: []metav1.Condition{
 						{
 							Type:   ocv1.TypeServing,
-							Status: metav1.ConditionTrue,
-							Reason: ocv1.ReasonAvailable,
+							Status: metav1.ConditionFalse,
+							Reason: ocv1.ReasonUserSpecifiedUnavailable,
 						},
 						{
 							Type:   ocv1.TypeProgressing,

internal/shared/util/finalizer/finalizer.go

@@ -93,9 +93,10 @@ func EnsureFinalizers(ctx context.Context, owner string, c client.Client, obj cl
 		return false, fmt.Errorf("updating finalizers: %w", err)
 	}
 
-	// Update only the finalizers in the original object to reflect the change,
-	// without copying other metadata that may have changed on the server.
+	// Update the finalizers and resource version in the original object to reflect the change.
+	// The resource version must be updated to avoid conflicts with subsequent operations.
 	obj.SetFinalizers(objCopy.GetFinalizers())
+	obj.SetResourceVersion(objCopy.GetResourceVersion())
 
 	return true, nil
 }