Merge pull request #6062 from Monokaix/fix-rb

fix pp suspension mistakenly override scheduling suspension
karmada-io · Jan 18, 2025 · 5bfdf61 · 5bfdf61
2 parents 4f86921 + cf46939
commit 5bfdf61
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/pkg/controllers/multiclusterservice/mcs_controller.go b/pkg/controllers/multiclusterservice/mcs_controller.go
@@ -404,7 +404,12 @@ func (c *MCSController) propagateService(ctx context.Context, mcs *networkingv1a
 			bindingCopy.Spec.Placement = binding.Spec.Placement
 			bindingCopy.Spec.Resource = binding.Spec.Resource
 			bindingCopy.Spec.ConflictResolution = binding.Spec.ConflictResolution
-			bindingCopy.Spec.Suspension = binding.Spec.Suspension
+			if binding.Spec.Suspension != nil {
+				if bindingCopy.Spec.Suspension == nil {
+					bindingCopy.Spec.Suspension = &workv1alpha2.Suspension{}
+				}
+				bindingCopy.Spec.Suspension.Suspension = binding.Spec.Suspension.Suspension
+			}
 			return nil
 		})
 		if err != nil {

diff --git a/pkg/detector/detector.go b/pkg/detector/detector.go
@@ -476,8 +476,13 @@ func (d *ResourceDetector) ApplyPolicy(object *unstructured.Unstructured, object
 			bindingCopy.Spec.Placement = binding.Spec.Placement
 			bindingCopy.Spec.Failover = binding.Spec.Failover
 			bindingCopy.Spec.ConflictResolution = binding.Spec.ConflictResolution
-			bindingCopy.Spec.Suspension = binding.Spec.Suspension
 			bindingCopy.Spec.PreserveResourcesOnDeletion = binding.Spec.PreserveResourcesOnDeletion
+			if binding.Spec.Suspension != nil {
+				if bindingCopy.Spec.Suspension == nil {
+					bindingCopy.Spec.Suspension = &workv1alpha2.Suspension{}
+				}
+				bindingCopy.Spec.Suspension.Suspension = binding.Spec.Suspension.Suspension
+			}
 			excludeClusterPolicy(bindingCopy)
 			return nil
 		})
@@ -565,8 +570,13 @@ func (d *ResourceDetector) ApplyClusterPolicy(object *unstructured.Unstructured,
 				bindingCopy.Spec.Placement = binding.Spec.Placement
 				bindingCopy.Spec.Failover = binding.Spec.Failover
 				bindingCopy.Spec.ConflictResolution = binding.Spec.ConflictResolution
-				bindingCopy.Spec.Suspension = binding.Spec.Suspension
 				bindingCopy.Spec.PreserveResourcesOnDeletion = binding.Spec.PreserveResourcesOnDeletion
+				if binding.Spec.Suspension != nil {
+					if bindingCopy.Spec.Suspension == nil {
+						bindingCopy.Spec.Suspension = &workv1alpha2.Suspension{}
+					}
+					bindingCopy.Spec.Suspension.Suspension = binding.Spec.Suspension.Suspension
+				}
 				return nil
 			})
 			return err
@@ -612,8 +622,13 @@ func (d *ResourceDetector) ApplyClusterPolicy(object *unstructured.Unstructured,
 				bindingCopy.Spec.Placement = binding.Spec.Placement
 				bindingCopy.Spec.Failover = binding.Spec.Failover
 				bindingCopy.Spec.ConflictResolution = binding.Spec.ConflictResolution
-				bindingCopy.Spec.Suspension = binding.Spec.Suspension
 				bindingCopy.Spec.PreserveResourcesOnDeletion = binding.Spec.PreserveResourcesOnDeletion
+				if binding.Spec.Suspension != nil {
+					if bindingCopy.Spec.Suspension == nil {
+						bindingCopy.Spec.Suspension = &workv1alpha2.Suspension{}
+					}
+					bindingCopy.Spec.Suspension.Suspension = binding.Spec.Suspension.Suspension
+				}
 				return nil
 			})
 			return err