minor fixes

Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>

Author: britaniar

pkg/controllers/workapplier/controller.go

@@ -561,6 +561,10 @@ func (r *Reconciler) ensureAppliedWork(ctx context.Context, work *fleetv1beta1.W
 			return nil, controller.NewAPIServerError(false, err)
 		}
 	}
+	if err := r.spokeClient.Get(ctx, types.NamespacedName{Name: workRef.Name}, appliedWork); err != nil {
+		klog.ErrorS(err, "Failed to get the appliedWork", "appliedWork", appliedWork.Name)
+		return nil, controller.NewAPIServerError(false, err)
+	}
 	klog.InfoS("Recreated the appliedWork resource", "appliedWork", workRef.Name)
 	return appliedWork, nil
 }

test/e2e/placement_apply_strategy_test.go

@@ -78,30 +78,21 @@ var _ = Describe("validating CRP when resources exists", Ordered, func() {
 		})
 
 		AfterAll(func() {
-			//By("removing the owner reference of the namespace")
-			//// Remove the extra owner reference from the namespace to avoid deletion delays.
-			//// With the new change to use foreground deletion on applied Work resources, the Work will be blocked
-			//// from deleting until the applied work is fully deleted. If the namespace has
-			//// multiple owner references, it won’t be deleted immediately, which can cause resource overlap
-			//// and flakiness in subsequent tests.
-			//removeOtherOwner(allMemberClusters[0])
-
 			By("deleting created work resources on member cluster")
 			cleanWorkResourcesOnCluster(allMemberClusters[0])
 
+			By(fmt.Sprintf("deleting placement %s", crpName))
+			cleanupCRP(crpName)
+
 			// Check if work is deleted. Needed to ensure that the Work resource is cleaned up before the next CRP is created.
 			// This is because the Work resource is created with a finalizer that blocks deletion until the all applied work
 			// and applied work itself is successfully deleted. If the Work resource is not deleted, it can cause resource overlap
 			// and flakiness in subsequent tests.
 			By("Check if work is deleted")
 			Eventually(func() bool {
 				work := &placementv1beta1.Work{}
-				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: "crp-1-work", Namespace: "fleet-member-kind-cluster-1"}, work))
+				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-work", crpName), Namespace: fmt.Sprintf("fleet-member-%s", allMemberClusterNames[0])}, work))
 			}, 6*eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Work resource should be deleted from hub")
-
-			By(fmt.Sprintf("deleting placement %s", crpName))
-			cleanupCRP(crpName)
-
 		})
 
 		It("should update CRP status as expected", func() {
@@ -166,7 +157,7 @@ var _ = Describe("validating CRP when resources exists", Ordered, func() {
 			By("Check if work is deleted")
 			Eventually(func() bool {
 				work := &placementv1beta1.Work{}
-				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: "crp-1-work", Namespace: "fleet-member-kind-cluster-1"}, work))
+				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-work", crpName), Namespace: fmt.Sprintf("fleet-member-%s", allMemberClusterNames[0])}, work))
 			}, 6*eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Work resource should be deleted from hub")
 
 			By(fmt.Sprintf("deleting placement %s", crpName))
@@ -281,29 +272,21 @@ var _ = Describe("validating CRP when resources exists", Ordered, func() {
 		})
 
 		AfterAll(func() {
-			//By("removing the owner reference of the namespace")
-			//// Remove the extra owner reference from the namespace to avoid deletion delays.
-			//// With the new change to use foreground deletion on applied Work resources, the Work will be blocked
-			//// from deleting until the applied work is fully deleted. If the namespace has
-			//// multiple owner references, it won’t be deleted immediately, which can cause resource overlap
-			//// and flakiness in subsequent tests.
-			//removeOtherOwner(allMemberClusters[0])
-
 			By("deleting created work resources on member cluster")
 			cleanWorkResourcesOnCluster(allMemberClusters[0])
 
+			By(fmt.Sprintf("deleting placement %s", crpName))
+			cleanupCRP(crpName)
+
 			// Check if work is deleted. Needed to ensure that the Work resource is cleaned up before the next CRP is created.
 			// This is because the Work resource is created with a finalizer that blocks deletion until the all applied work
 			// and applied work itself is successfully deleted. If the Work resource is not deleted, it can cause resource overlap
 			// and flakiness in subsequent tests.
 			By("Check if work is deleted")
 			Eventually(func() bool {
 				work := &placementv1beta1.Work{}
-				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: "crp-1-work", Namespace: "fleet-member-kind-cluster-1"}, work))
+				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-work", crpName), Namespace: fmt.Sprintf("fleet-member-%s", allMemberClusterNames[0])}, work))
 			}, 6*eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Work resource should be deleted from hub")
-
-			By(fmt.Sprintf("deleting placement %s", crpName))
-			cleanupCRP(crpName)
 		})
 
 		It("should update CRP status as expected", func() {
@@ -434,29 +417,21 @@ var _ = Describe("validating CRP when resources exists", Ordered, func() {
 		})
 
 		AfterAll(func() {
-			//By("removing the owner reference of the namespace")
-			//// Remove the extra owner reference from the namespace to avoid deletion delays.
-			//// With the new change to use foreground deletion on applied Work resources, the Work will be blocked
-			//// from deleting until the applied work is fully deleted. If the namespace has
-			//// multiple owner references, it won’t be deleted immediately, which can cause resource overlap
-			//// and flakiness in subsequent tests.
-			//removeOtherOwner(allMemberClusters[0])
-
 			By("deleting created work resources on member cluster")
 			cleanWorkResourcesOnCluster(allMemberClusters[0])
 
+			By(fmt.Sprintf("deleting placement %s", crpName))
+			cleanupCRP(crpName)
+
 			// Check if work is deleted. Needed to ensure that the Work resource is cleaned up before the next CRP is created.
 			// This is because the Work resource is created with a finalizer that blocks deletion until the all applied work
 			// and applied work itself is successfully deleted. If the Work resource is not deleted, it can cause resource overlap
 			// and flakiness in subsequent tests.
 			By("Check if work is deleted")
 			Eventually(func() bool {
 				work := &placementv1beta1.Work{}
-				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: "crp-1-work", Namespace: "fleet-member-kind-cluster-1"}, work))
+				return errors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-work", crpName), Namespace: fmt.Sprintf("fleet-member-%s", allMemberClusterNames[0])}, work))
 			}, 7*eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Work resource should be deleted from hub")
-
-			By(fmt.Sprintf("deleting placement %s", crpName))
-			cleanupCRP(crpName)
 		})
 
 		It("should update CRP status as expected", func() {

test/e2e/rollout_test.go

@@ -718,7 +718,7 @@ var _ = Describe("placing wrapped resources using a CRP", Ordered, func() {
 		})
 		// job is not trackable, so we need to wait for a bit longer for each roll out
 		It("should update CRP status as expected", func() {
-			crpStatusUpdatedActual := customizedCRPStatusUpdatedActual(crpName, wantSelectedResources, allMemberClusterNames, nil, "1", false)
+			crpStatusUpdatedActual := customizedCRPStatusUpdatedActual(crpName, wantSelectedResources, allMemberClusterNames, nil, "0", false)
 			Eventually(crpStatusUpdatedActual, 6*time.Duration(unAvailablePeriodSeconds)*time.Second, eventuallyInterval).Should(Succeed(), "Failed to update CRP status as expected")
 		})