add E2Es

Author: Arvindthiru

cmd/hubagent/workload/setup.go

@@ -229,7 +229,8 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 			}
 			klog.Info("Setting up cluster resource placement eviction controller")
 			if err := (&clusterresourceplacementeviction.Reconciler{
-				Client: mgr.GetClient(),
+				Client:         mgr.GetClient(),
+				UncachedReader: mgr.GetAPIReader(),
 			}).SetupWithManager(mgr); err != nil {
 				klog.ErrorS(err, "Unable to set up cluster resource placement eviction controller")
 				return err

pkg/controllers/clusterresourceplacementeviction/controller.go

@@ -30,6 +30,8 @@ import (
 // Reconciler reconciles a ClusterResourcePlacementEviction object.
 type Reconciler struct {
 	client.Client
+	// UncachedReader is only used to read disruption budget objects directly from the API server to ensure we can enforce the disruption budget for eviction.
+	UncachedReader client.Reader
 }
 
 // Reconcile triggers a single eviction reconcile round.
@@ -185,7 +187,7 @@ func (r *Reconciler) executeEviction(ctx context.Context, validationResult *evic
 	}
 
 	var db placementv1beta1.ClusterResourcePlacementDisruptionBudget
-	if err := r.Client.Get(ctx, types.NamespacedName{Name: crp.Name}, &db); err != nil {
+	if err := r.UncachedReader.Get(ctx, types.NamespacedName{Name: crp.Name}, &db); err != nil {
 		if k8serrors.IsNotFound(err) {
 			if err = r.deleteClusterResourceBinding(ctx, evictionTargetBinding); err != nil {
 				return err

pkg/controllers/clusterresourceplacementeviction/controller_test.go

@@ -624,7 +624,8 @@ func TestExecuteEviction(t *testing.T) {
 				WithObjects(objects...).
 				Build()
 			r := Reconciler{
-				Client: fakeClient,
+				Client:         fakeClient,
+				UncachedReader: fakeClient,
 			}
 			gotErr := r.executeEviction(ctx, tc.validationResult, tc.eviction)
 			gotExecutedCondition := tc.eviction.GetCondition(string(placementv1beta1.PlacementEvictionConditionTypeExecuted))

pkg/controllers/clusterresourceplacementeviction/suite_test.go

@@ -81,7 +81,8 @@ var _ = BeforeSuite(func() {
 	Expect(err).Should(Succeed())
 
 	err = (&Reconciler{
-		Client: k8sClient,
+		Client:         k8sClient,
+		UncachedReader: mgr.GetAPIReader(),
 	}).SetupWithManager(mgr)
 	Expect(err).Should(Succeed())
 

test/e2e/actuals_test.go

@@ -921,6 +921,15 @@ func crpEvictionRemovedActual(crpEvictionName string) func() error {
 	}
 }
 
+func crpDisruptionBudgetRemovedActual(crpDisruptionBudgetName string) func() error {
+	return func() error {
+		if err := hubClient.Get(ctx, types.NamespacedName{Name: crpDisruptionBudgetName}, &placementv1alpha1.ClusterResourcePlacementDisruptionBudget{}); !errors.IsNotFound(err) {
+			return fmt.Errorf("CRP disruption budget still exists or an unexpected error occurred: %w", err)
+		}
+		return nil
+	}
+}
+
 func validateCRPSnapshotRevisions(crpName string, wantPolicySnapshotRevision, wantResourceSnapshotRevision int) error {
 	matchingLabels := client.MatchingLabels{placementv1beta1.CRPTrackingLabel: crpName}
 

test/e2e/enveloped_object_placement_test.go

@@ -165,7 +165,7 @@ var _ = Describe("placing wrapped resources using a CRP", func() {
 
 		AfterAll(func() {
 			By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-			ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+			ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 		})
 	})
 
@@ -324,7 +324,7 @@ var _ = Describe("placing wrapped resources using a CRP", func() {
 
 		AfterAll(func() {
 			By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-			ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+			ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 		})
 	})
 })

test/e2e/join_and_leave_test.go

@@ -122,7 +122,7 @@ var _ = Describe("Test member cluster join and leave flow", Ordered, Serial, fun
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 	})
 })
 

test/e2e/placement_cro_test.go

@@ -77,7 +77,7 @@ var _ = Describe("creating clusterResourceOverride (selecting all clusters) to o
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)
@@ -205,7 +205,7 @@ var _ = Describe("creating clusterResourceOverride with multiple jsonPatchOverri
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)
@@ -341,7 +341,7 @@ var _ = Describe("creating clusterResourceOverride with different rules for each
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)
@@ -417,7 +417,7 @@ var _ = Describe("creating clusterResourceOverride with different rules for each
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)
@@ -494,7 +494,7 @@ var _ = Describe("creating clusterResourceOverride with incorrect path", Ordered
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)
@@ -564,7 +564,7 @@ var _ = Describe("creating clusterResourceOverride with and resource becomes inv
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)
@@ -653,7 +653,7 @@ var _ = Describe("creating clusterResourceOverride with delete rules for one clu
 
 	AfterAll(func() {
 		By(fmt.Sprintf("deleting placement %s and related resources", crpName))
-		ensureCRPAndRelatedResourcesDeletion(crpName, allMemberClusters)
+		ensureCRPAndRelatedResourcesDeleted(crpName, allMemberClusters)
 
 		By(fmt.Sprintf("deleting clusterResourceOverride %s", croName))
 		cleanupClusterResourceOverride(croName)