using mw finalizer instead of resource fianalizer

Signed-off-by: Wei Liu <liuweixa@redhat.com>

Author: skeeey

pkg/cloudevents/clients/common/common.go

@@ -30,8 +30,6 @@ const CloudEventsOriginalSourceLabelKey = "cloudevents.open-cluster-management.i
 // ResourceDeleted represents a resource is deleted.
 const ResourceDeleted = "Deleted"
 
-const ResourceFinalizer = "cloudevents.open-cluster-management.io/resource-cleanup"
-
 var ManagedClusterGK = schema.GroupKind{Group: clusterv1.GroupName, Kind: "ManagedCluster"}
 var ManagedClusterGR = schema.GroupResource{Group: clusterv1.GroupName, Resource: "managedclusters"}
 

pkg/cloudevents/clients/utils/utils.go

@@ -21,7 +21,6 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/klog/v2"
 
-	"open-cluster-management.io/sdk-go/pkg/cloudevents/clients/common"
 	"open-cluster-management.io/sdk-go/pkg/cloudevents/generic"
 )
 
@@ -225,23 +224,6 @@ func UID(sourceID, groupResource, namespace, name string) string {
 	return uuid.NewSHA1(uuid.NameSpaceOID, []byte(id)).String()
 }
 
-// EnsureResourceFinalizer ensures the resource finalizer in the given finalizers
-func EnsureResourceFinalizer(finalizers []string) []string {
-	has := false
-	for _, f := range finalizers {
-		if f == common.ResourceFinalizer {
-			has = true
-			break
-		}
-	}
-
-	if !has {
-		finalizers = append(finalizers, common.ResourceFinalizer)
-	}
-
-	return finalizers
-}
-
 func IsStatusPatch(subresources []string) bool {
 	if len(subresources) == 0 {
 		return false

pkg/cloudevents/clients/utils/utils_test.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"encoding/json"
-	"reflect"
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -453,41 +452,3 @@ func TestCompareSnowflakeSequenceIDs(t *testing.T) {
 		})
 	}
 }
-
-func TestEnsureResourceFinalizer(t *testing.T) {
-	tests := []struct {
-		name       string
-		input      []string
-		wantOutput []string
-	}{
-		{
-			name:       "empty finalizers",
-			input:      []string{},
-			wantOutput: []string{common.ResourceFinalizer},
-		},
-		{
-			name:       "finalizer already exists",
-			input:      []string{"other-finalizer", common.ResourceFinalizer},
-			wantOutput: []string{"other-finalizer", common.ResourceFinalizer},
-		},
-		{
-			name:       "finalizer not present",
-			input:      []string{"finalizer1", "finalizer2"},
-			wantOutput: []string{"finalizer1", "finalizer2", common.ResourceFinalizer},
-		},
-		{
-			name:       "nil input",
-			input:      nil,
-			wantOutput: []string{common.ResourceFinalizer},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := EnsureResourceFinalizer(tt.input)
-			if !reflect.DeepEqual(got, tt.wantOutput) {
-				t.Errorf("EnsureFinalizers() = %v, want %v", got, tt.wantOutput)
-			}
-		})
-	}
-}

pkg/cloudevents/clients/utils/work.go

@@ -48,3 +48,20 @@ func EncodeManifests(work *workv1.ManifestWork) error {
 
 	return nil
 }
+
+// EnsureManifestWorkFinalizer ensures the resource finalizer in the given finalizers
+func EnsureManifestWorkFinalizer(finalizers []string) []string {
+	has := false
+	for _, f := range finalizers {
+		if f == workv1.ManifestWorkFinalizer {
+			has = true
+			break
+		}
+	}
+
+	if !has {
+		finalizers = append(finalizers, workv1.ManifestWorkFinalizer)
+	}
+
+	return finalizers
+}

pkg/cloudevents/clients/utils/work_test.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"encoding/json"
+	"reflect"
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
@@ -64,6 +65,44 @@ func TestEncodeManifests(t *testing.T) {
 	}
 }
 
+func TestEnsureManifestWorkFinalizer(t *testing.T) {
+	tests := []struct {
+		name       string
+		input      []string
+		wantOutput []string
+	}{
+		{
+			name:       "empty finalizers",
+			input:      []string{},
+			wantOutput: []string{workv1.ManifestWorkFinalizer},
+		},
+		{
+			name:       "finalizer already exists",
+			input:      []string{"other-finalizer", workv1.ManifestWorkFinalizer},
+			wantOutput: []string{"other-finalizer", workv1.ManifestWorkFinalizer},
+		},
+		{
+			name:       "finalizer not present",
+			input:      []string{"finalizer1", "finalizer2"},
+			wantOutput: []string{"finalizer1", "finalizer2", workv1.ManifestWorkFinalizer},
+		},
+		{
+			name:       "nil input",
+			input:      nil,
+			wantOutput: []string{workv1.ManifestWorkFinalizer},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := EnsureManifestWorkFinalizer(tt.input)
+			if !reflect.DeepEqual(got, tt.wantOutput) {
+				t.Errorf("EnsureFinalizers() = %v, want %v", got, tt.wantOutput)
+			}
+		})
+	}
+}
+
 func configMap() *corev1.ConfigMap {
 	return &corev1.ConfigMap{
 		TypeMeta: metav1.TypeMeta{

pkg/cloudevents/clients/work/store/base.go

@@ -155,8 +155,8 @@ func (b *workProcessor) handleWork(work *workv1.ManifestWork) error {
 		return nil
 	}
 
-	// the work has been handled by agent, we ensure a finalizer on the work
-	updatedWork.Finalizers = utils.EnsureResourceFinalizer(updatedWork.Finalizers)
+	// the work has been handled by agent, we ensure the manifestwork finalizer on the work
+	updatedWork.Finalizers = utils.EnsureManifestWorkFinalizer(updatedWork.Finalizers)
 	updatedWork.Annotations[common.CloudEventsSequenceIDAnnotationKey] = sequenceID
 	updatedWork.Status = work.Status
 	// update the work with status in the local cache.