fix the test

Azure · Oct 28, 2024 · 65c71d2 · 65c71d2
1 parent 251b3a3
commit 65c71d2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 15 deletions.
diff --git a/apis/cluster/v1beta1/zz_generated.deepcopy.go b/apis/cluster/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/placement/v1alpha1/zz_generated.deepcopy.go b/apis/placement/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/placement/v1beta1/zz_generated.deepcopy.go b/apis/placement/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controllers/workgenerator/controller.go b/pkg/controllers/workgenerator/controller.go
@@ -136,7 +136,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req controllerruntime.Reques
 
 	workUpdated := false
 	overrideSucceeded := false
-	resourceBinding.Status.FailedPlacements = nil
 	// list all the corresponding works
 	works, syncErr := r.listAllWorksAssociated(ctx, &resourceBinding)
 	if syncErr == nil {
@@ -147,6 +146,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req controllerruntime.Reques
 	for i := condition.OverriddenCondition; i < condition.TotalCondition; i++ {
 		resourceBinding.RemoveCondition(string(i.ResourceBindingConditionType()))
 	}
+	resourceBinding.Status.FailedPlacements = nil
 	if overrideSucceeded {
 		overrideReason := condition.OverriddenSucceededReason
 		overrideMessage := "Successfully applied the override rules on the resources"

diff --git a/pkg/controllers/workgenerator/controller_integration_test.go b/pkg/controllers/workgenerator/controller_integration_test.go
@@ -497,14 +497,8 @@ var _ = Describe("Test Work Generator Controller", func() {
 								},
 								{
 									Type:               string(placementv1beta1.ResourceBindingOverridden),
-									Status:             metav1.ConditionTrue,
-									Reason:             condition.OverrideNotSpecifiedReason,
-									ObservedGeneration: binding.GetGeneration(),
-								},
-								{
-									Type:               string(placementv1beta1.ResourceBindingWorkSynchronized),
 									Status:             metav1.ConditionFalse,
-									Reason:             condition.SyncWorkFailedReason,
+									Reason:             condition.OverriddenFailedReason,
 									ObservedGeneration: binding.GetGeneration(),
 								},
 							},

diff --git a/test/apis/v1alpha1/zz_generated.deepcopy.go b/test/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/test/e2e/rollout_test.go b/test/e2e/rollout_test.go
@@ -655,7 +655,7 @@ var _ = Describe("placing wrapped resources using a CRP", Ordered, func() {
 		})
 	})
 
-	FContext("Test a CRP place custom resource successfully, should wait to update resource on multiple member clusters", Ordered, func() {
+	Context("Test a CRP place custom resource successfully, should wait to update resource on multiple member clusters", Ordered, func() {
 		crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
 		workNamespace := appNamespace()
 		var wantSelectedResources []placementv1beta1.ResourceIdentifier