fixup! Use SSA instead of Update for finalizer operations

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

Author: tmshort

internal/catalogd/controllers/core/clustercatalog_controller_test.go

@@ -384,7 +384,7 @@ func TestCatalogdControllerReconcile(t *testing.T) {
 			expectedCatalog: &ocv1.ClusterCatalog{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:              "catalog",
-					Finalizers:        []string{},
+					Finalizers:        nil,
 					DeletionTimestamp: &metav1.Time{Time: time.Date(2023, time.October, 10, 4, 19, 0, 0, time.UTC)},
 				},
 				Spec: ocv1.ClusterCatalogSpec{
@@ -665,7 +665,7 @@ func TestCatalogdControllerReconcile(t *testing.T) {
 			expectedCatalog: &ocv1.ClusterCatalog{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:       "catalog",
-					Finalizers: []string{},
+					Finalizers: nil,
 				},
 				Spec: ocv1.ClusterCatalogSpec{
 					Source: ocv1.CatalogSource{

internal/shared/util/finalizer/finalizer.go

@@ -78,7 +78,7 @@ func AddFinalizers(ctx context.Context, owner string, c client.Client, obj clien
 	}
 
 	// Update the passed object with the new finalizers
-	obj.SetFinalizers(newFinalizers)
+	obj.SetFinalizers(u.GetFinalizers())
 	obj.SetResourceVersion(u.GetResourceVersion())
 
 	return true, nil
@@ -130,7 +130,7 @@ func RemoveFinalizers(ctx context.Context, owner string, c client.Client, obj cl
 	}
 
 	// Update the passed object with the new finalizers
-	obj.SetFinalizers(newFinalizers)
+	obj.SetFinalizers(u.GetFinalizers())
 	obj.SetResourceVersion(u.GetResourceVersion())
 
 	return nil