../..

Signed-off-by: Kexin2000 <3299133282@qq.com>

Author: Kexin2000

pkg/dependenciesdistributor/dependencies_distributor.go

@@ -589,9 +589,6 @@ func (d *DependenciesDistributor) createOrUpdateAttachedBinding(attachedBinding
 
 		mergedRequiredBy := mergeBindingSnapshot(existBinding.Spec.RequiredBy, attachedBinding.Spec.RequiredBy)
 
-		conflictDetected := false
-		var conflictReasons []string
-
 		// If the spec.Placement is nil, this means that existBinding is generated by the dependency mechanism.
 		// If the spec.Placement is not nil, then it must be generated by PropagationPolicy.
 		if existBinding.Spec.Placement == nil {
@@ -600,20 +597,14 @@ func (d *DependenciesDistributor) createOrUpdateAttachedBinding(attachedBinding
 				klog.Errorf("Failed to check conflict for resourceBinding(%s): %v", bindingKey, err)
 				return err
 			}
-			if crConflictDetected {
-				conflictDetected = true
-				conflictReasons = append(conflictReasons, "ConflictResolution mismatch (Overwrite vs Abort)")
-			}
 
 			preserveConflictDetected, err := d.conflictDetectedForPreserveOnDeletion(mergedRequiredBy)
 			if err != nil {
 				klog.Errorf("Failed to check preserveOnDeletion conflict for resourceBinding(%s): %v", bindingKey, err)
 				return err
 			}
-			if preserveConflictDetected {
-				conflictDetected = true
-				conflictReasons = append(conflictReasons, "PreserveResourcesOnDeletion mismatch (true vs false)")
-			}
+
+			d.recordEventIfPolicyConflict(existBinding, crConflictDetected, preserveConflictDetected)
 
 			existBinding.Spec.ConflictResolution = attachedBinding.Spec.ConflictResolution
 		}
@@ -623,13 +614,6 @@ func (d *DependenciesDistributor) createOrUpdateAttachedBinding(attachedBinding
 		existBinding.Spec.Resource = attachedBinding.Spec.Resource
 		existBinding.Spec.PreserveResourcesOnDeletion = attachedBinding.Spec.PreserveResourcesOnDeletion
 
-		if conflictDetected && d.EventRecorder != nil {
-			// Emit a warning event indicating which policies conflicted.
-			// Use placeholders to include the concrete conflicting dimensions in the message.
-			message := "Dependency policy conflict detected: %s."
-			d.EventRecorder.Eventf(existBinding, corev1.EventTypeWarning, events.EventReasonDependencyPolicyConflict, message, strings.Join(conflictReasons, "; "))
-		}
-
 		if err := d.Client.Update(context.TODO(), existBinding); err != nil {
 			klog.Errorf("Failed to update resourceBinding(%s): %v", bindingKey, err)
 			return err
@@ -645,52 +629,26 @@ func (d *DependenciesDistributor) createOrUpdateAttachedBinding(attachedBinding
 	return d.Client.Create(context.TODO(), attachedBinding)
 }
 
-// conflictDetectedForConflictResolution checks if there is a conflict in ConflictResolution from referencing ResourceBindings.
-// Rules: any Overwrite -> Overwrite; else Abort. Returns whether a conflict was detected.
-func (d *DependenciesDistributor) conflictDetectedForConflictResolution(requiredBy []workv1alpha2.BindingSnapshot) (hasConflict bool, err error) {
-	hasOverwrite := false
-	hasAbort := false
-
-	for _, snap := range requiredBy {
-		refRB := &workv1alpha2.ResourceBinding{}
-		if err := d.Client.Get(context.TODO(), client.ObjectKey{Namespace: snap.Namespace, Name: snap.Name}, refRB); err != nil {
-			return false, err
-		}
+func (d *DependenciesDistributor) recordEventIfPolicyConflict(existBinding *workv1alpha2.ResourceBinding, crConflictDetected, preserveConflictDetected bool) {
+	conflictDetected := false
+	var conflictReasons []string
 
-		cr := effectiveConflictResolution(refRB.Spec.ConflictResolution)
-		if cr == policyv1alpha1.ConflictOverwrite {
-			hasOverwrite = true
-		} else {
-			hasAbort = true
-		}
+	if crConflictDetected {
+		conflictDetected = true
+		conflictReasons = append(conflictReasons, "ConflictResolution mismatch (Overwrite vs Abort)")
 	}
 
-	hasConflict = hasOverwrite && hasAbort
-	return hasConflict, nil
-}
-
-// conflictDetectedForPreserveOnDeletion checks if there is a conflict in PreserveResourcesOnDeletion from referencing ResourceBindings.
-// Rules: any true -> true; else false. Returns whether a conflict was detected.
-func (d *DependenciesDistributor) conflictDetectedForPreserveOnDeletion(requiredBy []workv1alpha2.BindingSnapshot) (hasConflict bool, err error) {
-	seenTrue := false
-	seenFalse := false
-
-	for _, snap := range requiredBy {
-		refRB := &workv1alpha2.ResourceBinding{}
-		if err := d.Client.Get(context.TODO(), client.ObjectKey{Namespace: snap.Namespace, Name: snap.Name}, refRB); err != nil {
-			return false, err
-		}
-
-		pres := ptr.Deref(refRB.Spec.PreserveResourcesOnDeletion, false)
-		if pres {
-			seenTrue = true
-		} else {
-			seenFalse = true
-		}
+	if preserveConflictDetected {
+		conflictDetected = true
+		conflictReasons = append(conflictReasons, "PreserveResourcesOnDeletion mismatch (true vs false)")
 	}
 
-	hasConflict = seenTrue && seenFalse
-	return hasConflict, nil
+	if conflictDetected {
+		// Emit a warning event indicating which policies conflicted.
+		// Use placeholders to include the concrete conflicting dimensions in the message.
+		message := "Dependency policy conflict detected: %s."
+		d.EventRecorder.Eventf(existBinding, corev1.EventTypeWarning, events.EventReasonDependencyPolicyConflict, message, strings.Join(conflictReasons, "; "))
+	}
 }
 
 // Start runs the distributor, never stop until context canceled.

pkg/dependenciesdistributor/policy_utils.go

@@ -0,0 +1,75 @@
+/*
+Copyright 2025 The Karmada Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package dependenciesdistributor
+
+import (
+	"context"
+
+	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	policyv1alpha1 "github.com/karmada-io/karmada/pkg/apis/policy/v1alpha1"
+	workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
+)
+
+// conflictDetectedForConflictResolution checks if there is a conflict in ConflictResolution from referencing ResourceBindings.
+func (d *DependenciesDistributor) conflictDetectedForConflictResolution(requiredBy []workv1alpha2.BindingSnapshot) (hasConflict bool, err error) {
+	hasOverwrite := false
+	hasAbort := false
+
+	for _, snap := range requiredBy {
+		refRB := &workv1alpha2.ResourceBinding{}
+		if err := d.Client.Get(context.TODO(), client.ObjectKey{Namespace: snap.Namespace, Name: snap.Name}, refRB); err != nil {
+			return false, err
+		}
+
+		cr := effectiveConflictResolution(refRB.Spec.ConflictResolution)
+		if cr == policyv1alpha1.ConflictOverwrite {
+			hasOverwrite = true
+		} else {
+			hasAbort = true
+		}
+	}
+
+	hasConflict = hasOverwrite && hasAbort
+	return hasConflict, nil
+}
+
+// conflictDetectedForPreserveOnDeletion checks if there is a conflict in PreserveResourcesOnDeletion from referencing ResourceBindings.
+func (d *DependenciesDistributor) conflictDetectedForPreserveOnDeletion(requiredBy []workv1alpha2.BindingSnapshot) (hasConflict bool, err error) {
+	// seenTrue indicates at least one referencing ResourceBinding has PreserveResourcesOnDeletion set to true.
+	// seenFalse indicates at least one referencing ResourceBinding has PreserveResourcesOnDeletion set to false.
+	seenTrue := false
+	seenFalse := false
+
+	for _, snap := range requiredBy {
+		refRB := &workv1alpha2.ResourceBinding{}
+		if err := d.Client.Get(context.TODO(), client.ObjectKey{Namespace: snap.Namespace, Name: snap.Name}, refRB); err != nil {
+			return false, err
+		}
+
+		pres := ptr.Deref(refRB.Spec.PreserveResourcesOnDeletion, false)
+		if pres {
+			seenTrue = true
+		} else {
+			seenFalse = true
+		}
+	}
+
+	hasConflict = seenTrue && seenFalse
+	return hasConflict, nil
+}