Merge pull request #4770 from XiShanYongYe-Chang/automated-cherry-pic…

…k-of-#4751-upstream-release-1.7 Automated cherry pick of #4751: fix wrong annotation marks on resource
karmada-io · Mar 28, 2024 · 5ce59e7 · 5ce59e7
2 parents 7d8674b + 795ef15
commit 5ce59e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/detector/detector.go b/pkg/detector/detector.go
@@ -657,7 +657,7 @@ func (d *ResourceDetector) ClaimClusterPolicyForObject(object *unstructured.Unst
 	util.MergeLabel(objectCopy, policyv1alpha1.ClusterPropagationPolicyLabel, policyName)
 	util.MergeLabel(objectCopy, policyv1alpha1.ClusterPropagationPolicyUIDLabel, policyUID)
 
-	util.MergeAnnotation(objectCopy, policyv1alpha1.ClusterPropagationPolicyAnnotation, policyName)
+	util.ReplaceAnnotation(objectCopy, policyv1alpha1.ClusterPropagationPolicyAnnotation, policyName)
 	return d.Client.Update(context.TODO(), objectCopy)
 }
 

diff --git a/pkg/util/helper/work.go b/pkg/util/helper/work.go
@@ -27,7 +27,7 @@ func CreateOrUpdateWork(client client.Client, workMeta metav1.ObjectMeta, resour
 	if conflictResolution, ok := workMeta.GetAnnotations()[workv1alpha2.ResourceConflictResolutionAnnotation]; ok {
 		util.ReplaceAnnotation(workload, workv1alpha2.ResourceConflictResolutionAnnotation, conflictResolution)
 	}
-	util.MergeAnnotation(workload, workv1alpha2.ResourceTemplateUIDAnnotation, string(workload.GetUID()))
+	util.ReplaceAnnotation(workload, workv1alpha2.ResourceTemplateUIDAnnotation, string(workload.GetUID()))
 	util.RecordManagedAnnotations(workload)
 	util.RecordManagedLabels(workload)
 	workloadJSON, err := workload.MarshalJSON()