fix e2e tests

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

Author: britaniar

pkg/controllers/workgenerator/controller.go

@@ -1286,7 +1286,7 @@ func setAllWorkAvailableCondition(resourcesSelected bool, works map[string]*flee
 				Status:             metav1.ConditionTrue,
 				Type:               string(fleetv1beta1.ResourceBindingAvailable),
 				Reason:             condition.NoResourcesSelectedReason,
-				Message:            "No resources selected. Please update CRP to select resources.",
+				Message:            "No resources selected.",
 				ObservedGeneration: binding.GetGeneration(),
 			})
 			return workConditionSummarizedStatusTrue

test/e2e/actuals_test.go

@@ -419,7 +419,11 @@ func crpRolloutCompletedConditions(generation int64, hasOverride bool) []metav1.
 	}
 }
 
-func crpNoResourcesSelectedConditions(generation int64) []metav1.Condition {
+func crpNoResourcesSelectedConditions(generation int64, hasOverride bool) []metav1.Condition {
+	overrideConditionReason := condition.OverrideNotSpecifiedReason
+	if hasOverride {
+		overrideConditionReason = condition.OverriddenSucceededReason
+	}
 	return []metav1.Condition{
 		{
 			Type:               string(placementv1beta1.ClusterResourcePlacementScheduledConditionType),
@@ -436,13 +440,13 @@ func crpNoResourcesSelectedConditions(generation int64) []metav1.Condition {
 		{
 			Type:               string(placementv1beta1.ClusterResourcePlacementOverriddenConditionType),
 			Status:             metav1.ConditionTrue,
-			Reason:             condition.OverrideNotSpecifiedReason,
+			Reason:             overrideConditionReason,
 			ObservedGeneration: generation,
 		},
 		{
 			Type:               string(placementv1beta1.ClusterResourcePlacementWorkSynchronizedConditionType),
 			Status:             metav1.ConditionTrue,
-			Reason:             condition.AllWorkSyncedReason,
+			Reason:             condition.WorkSynchronizedReason,
 			ObservedGeneration: generation,
 		},
 		{
@@ -451,6 +455,12 @@ func crpNoResourcesSelectedConditions(generation int64) []metav1.Condition {
 			Reason:             condition.ApplySucceededReason,
 			ObservedGeneration: generation,
 		},
+		{
+			Type:               string(placementv1beta1.ClusterResourcePlacementAvailableConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             condition.NoResourcesSelectedReason,
+			ObservedGeneration: generation,
+		},
 	}
 }
 
@@ -591,6 +601,52 @@ func resourcePlacementRolloutCompletedConditions(generation int64, resourceIsTra
 	}
 }
 
+func resourcePlacementRolloutCompletedConditionsWithNoSelectedResource(generation int64, hasOverride bool) []metav1.Condition {
+	overrideConditionReason := condition.OverrideNotSpecifiedReason
+	if hasOverride {
+		overrideConditionReason = condition.OverriddenSucceededReason
+	}
+
+	return []metav1.Condition{
+		{
+			Type:               string(placementv1beta1.ResourceScheduledConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             condition.ScheduleSucceededReason,
+			ObservedGeneration: generation,
+		},
+		{
+			Type:               string(placementv1beta1.ResourceRolloutStartedConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             condition.RolloutStartedReason,
+			ObservedGeneration: generation,
+		},
+		{
+			Type:               string(placementv1beta1.ResourceOverriddenConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             overrideConditionReason,
+			ObservedGeneration: generation,
+		},
+		{
+			Type:               string(placementv1beta1.ResourceWorkSynchronizedConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             condition.AllWorkSyncedReason,
+			ObservedGeneration: generation,
+		},
+		{
+			Type:               string(placementv1beta1.ResourcesAppliedConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             condition.AllWorkAppliedReason,
+			ObservedGeneration: generation,
+		},
+		{
+			Type:               string(placementv1beta1.ResourcesAvailableConditionType),
+			Status:             metav1.ConditionTrue,
+			Reason:             condition.NoResourcesSelectedReason,
+			ObservedGeneration: generation,
+		},
+	}
+}
+
 func resourcePlacementScheduleFailedConditions(generation int64) []metav1.Condition {
 	return []metav1.Condition{
 		{
@@ -861,10 +917,17 @@ func customizedCRPStatusUpdatedActual(crpName string,
 
 		wantPlacementStatus := []placementv1beta1.ResourcePlacementStatus{}
 		for _, name := range wantSelectedClusters {
-			wantPlacementStatus = append(wantPlacementStatus, placementv1beta1.ResourcePlacementStatus{
-				ClusterName: name,
-				Conditions:  resourcePlacementRolloutCompletedConditions(crp.Generation, resourceIsTrackable, false),
-			})
+			if len(wantSelectedResourceIdentifiers) == 0 || wantSelectedResourceIdentifiers == nil {
+				wantPlacementStatus = append(wantPlacementStatus, placementv1beta1.ResourcePlacementStatus{
+					ClusterName: name,
+					Conditions:  resourcePlacementRolloutCompletedConditionsWithNoSelectedResource(crp.Generation, false),
+				})
+			} else {
+				wantPlacementStatus = append(wantPlacementStatus, placementv1beta1.ResourcePlacementStatus{
+					ClusterName: name,
+					Conditions:  resourcePlacementRolloutCompletedConditions(crp.Generation, resourceIsTrackable, false),
+				})
+			}
 		}
 		for i := 0; i < len(wantUnselectedClusters); i++ {
 			wantPlacementStatus = append(wantPlacementStatus, placementv1beta1.ResourcePlacementStatus{
@@ -874,8 +937,8 @@ func customizedCRPStatusUpdatedActual(crpName string,
 
 		var wantCRPConditions []metav1.Condition
 		if len(wantSelectedClusters) > 0 {
-			if len(wantSelectedResourceIdentifiers) == 0 {
-				wantCRPConditions = crpNoResourcesSelectedConditions(crp.Generation)
+			if len(wantSelectedResourceIdentifiers) == 0 || wantSelectedResourceIdentifiers == nil {
+				wantCRPConditions = crpNoResourcesSelectedConditions(crp.Generation, false)
 			} else {
 				wantCRPConditions = crpRolloutCompletedConditions(crp.Generation, false)
 			}

test/e2e/placement_cro_test.go

@@ -18,6 +18,7 @@ package e2e
 import (
 	"fmt"
 
+	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -690,7 +691,53 @@ var _ = Context("creating clusterResourceOverride with delete rules for one clus
 
 	It("should update CRP status as expected", func() {
 		wantCRONames := []string{fmt.Sprintf(placementv1alpha1.OverrideSnapshotNameFmt, croName, 0)}
-		crpStatusUpdatedActual := crpStatusWithOverrideUpdatedActual(workResourceIdentifiers(), allMemberClusterNames, "0", wantCRONames, nil)
+		crpStatusUpdatedActual := func() error {
+			crp := &placementv1beta1.ClusterResourcePlacement{}
+			if err := hubClient.Get(ctx, types.NamespacedName{Name: crpName}, crp); err != nil {
+				return err
+			}
+
+			workNamespaceName := fmt.Sprintf(workNamespaceNameTemplate, GinkgoParallelProcess())
+			appConfigMapName := fmt.Sprintf(appConfigMapNameTemplate, GinkgoParallelProcess())
+			wantStatus := placementv1beta1.ClusterResourcePlacementStatus{
+				Conditions: crpRolloutCompletedConditions(crp.Generation, true),
+				PlacementStatuses: []placementv1beta1.ResourcePlacementStatus{
+					{
+						ClusterName:                        memberCluster1EastProdName,
+						Conditions:                         resourcePlacementRolloutCompletedConditions(crp.Generation, true, true),
+						ApplicableClusterResourceOverrides: wantCRONames,
+					},
+					{
+						ClusterName:                        memberCluster2EastCanaryName,
+						Conditions:                         resourcePlacementRolloutCompletedConditions(crp.Generation, true, true),
+						ApplicableClusterResourceOverrides: wantCRONames,
+					},
+					{
+						ClusterName:                        memberCluster3WestProdName,
+						Conditions:                         resourcePlacementRolloutCompletedConditionsWithNoSelectedResource(crp.Generation, true),
+						ApplicableClusterResourceOverrides: wantCRONames,
+					},
+				},
+				SelectedResources: []placementv1beta1.ResourceIdentifier{
+					{
+						Kind:    "Namespace",
+						Name:    workNamespaceName,
+						Version: "v1",
+					},
+					{
+						Kind:      "ConfigMap",
+						Name:      appConfigMapName,
+						Version:   "v1",
+						Namespace: workNamespaceName,
+					},
+				},
+				ObservedResourceIndex: "0",
+			}
+			if diff := cmp.Diff(crp.Status, wantStatus, crpStatusCmpOptions...); diff != "" {
+				return fmt.Errorf("CRP status diff (-got, +want): %s", diff)
+			}
+			return nil
+		}
 		Eventually(crpStatusUpdatedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update CRP %s status as expected", crpName)
 	})