address comment

Signed-off-by: Ryan Zhang <[email protected]>

Author: Ryan Zhang

pkg/controllers/rollout/controller.go

@@ -153,10 +153,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req runtime.Request) (runtim
 			"placement", placementObjRef)
 		return runtime.Result{}, err
 	}
-	if masterResourceSnapshot == nil {
-		err := controller.NewUnexpectedBehaviorError(fmt.Errorf("no masterResourceSnapshot found for the placement %s", placementKey))
-		return runtime.Result{}, err
-	}
 	klog.V(2).InfoS("Found the masterResourceSnapshot for the placement", "placement", placementObjRef, "masterResourceSnapshot", klog.KObj(masterResourceSnapshot))
 
 	// Note: there is a corner case that an override is in-between snapshots (the old one is marked as not the latest while the new one is not created yet)
@@ -701,16 +697,6 @@ func (r *Reconciler) SetupWithManager(mgr runtime.Manager) error {
 				handleResourceSnapshot(e.Object, q)
 			},
 		}).
-		Watches(&fleetv1beta1.ResourceSnapshot{}, handler.Funcs{
-			CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
-				klog.V(2).InfoS("Handling a resource snapshot create event", "resourceSnapshot", klog.KObj(e.Object))
-				handleResourceSnapshot(e.Object, q)
-			},
-			GenericFunc: func(ctx context.Context, e event.GenericEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
-				klog.V(2).InfoS("Handling a resource snapshot generic event", "resourceSnapshot", klog.KObj(e.Object))
-				handleResourceSnapshot(e.Object, q)
-			},
-		}).
 		Watches(&fleetv1alpha1.ClusterResourceOverrideSnapshot{}, handler.Funcs{
 			CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
 				klog.V(2).InfoS("Handling a clusterResourceOverrideSnapshot create event", "clusterResourceOverrideSnapshot", klog.KObj(e.Object))
@@ -778,19 +764,6 @@ func (r *Reconciler) SetupWithManager(mgr runtime.Manager) error {
 				enqueueResourceBinding(e.Object, q)
 			},
 		}).
-		Watches(&fleetv1beta1.ResourceBinding{}, handler.Funcs{
-			CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
-				klog.V(2).InfoS("Handling a resource binding create event", "resourceBinding", klog.KObj(e.Object))
-				enqueueResourceBinding(e.Object, q)
-			},
-			UpdateFunc: func(ctx context.Context, e event.UpdateEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
-				handleResourceBindingUpdated(e.ObjectNew, e.ObjectOld, q)
-			},
-			GenericFunc: func(ctx context.Context, e event.GenericEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
-				klog.V(2).InfoS("Handling a resource binding generic event", "resourceBinding", klog.KObj(e.Object))
-				enqueueResourceBinding(e.Object, q)
-			},
-		}).
 		// Aside from resource snapshot and binding objects, the rollout
 		// controller also watches placement objects (ClusterResourcePlacement and ResourcePlacement),
 		// so that it can push apply strategy updates to all bindings right away.
@@ -800,12 +773,6 @@ func (r *Reconciler) SetupWithManager(mgr runtime.Manager) error {
 				handlePlacement(e.ObjectNew, e.ObjectOld, q)
 			},
 		}).
-		Watches(&fleetv1beta1.ResourcePlacement{}, handler.Funcs{
-			// Ignore all Create, Delete, and Generic events; these do not concern the rollout controller.
-			UpdateFunc: func(ctx context.Context, e event.UpdateEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
-				handlePlacement(e.ObjectNew, e.ObjectOld, q)
-			},
-		}).
 		Complete(r)
 }
 

pkg/utils/controller/controller.go

@@ -410,9 +410,6 @@ func CollectResourceIdentifiersFromClusterResourceSnapshot(
 		listOptions = append(listOptions, client.InNamespace(namespace))
 	} else {
 		resourceSnapshotList = &fleetv1beta1.ClusterResourceSnapshotList{}
-		listOptions = append(listOptions, client.MatchingLabels{
-			fleetv1beta1.CRPTrackingLabel: name,
-		})
 	}
 	if err := k8Client.List(ctx, resourceSnapshotList, listOptions...); err != nil {
 		klog.ErrorS(err, "Failed to list the clusterResourceSnapshots associated with the clusterResourcePlacement",

pkg/utils/controller/controller_test.go

@@ -490,9 +490,6 @@ func TestFetchAllClusterResourceSnapshots(t *testing.T) {
 			}
 			options := []cmp.Option{
 				cmpopts.IgnoreFields(metav1.ObjectMeta{}, "ResourceVersion"),
-				cmpopts.SortMaps(func(s1, s2 string) bool {
-					return s1 < s2
-				}),
 			}
 			theSortedKeys := slices.Sorted(maps.Keys(got))
 			for i := range theSortedKeys {

pkg/utils/controller/resource_snapshot_resolver.go

@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+	"fmt"
 
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -46,9 +47,6 @@ func FetchMasterResourceSnapshot(ctx context.Context, k8Client client.Reader, pl
 		listOptions = append(listOptions, client.InNamespace(namespace))
 	} else {
 		resourceSnapshotList = &fleetv1beta1.ClusterResourceSnapshotList{}
-		listOptions = append(listOptions, client.MatchingLabels{
-			fleetv1beta1.CRPTrackingLabel: name,
-		})
 	}
 	if err := k8Client.List(ctx, resourceSnapshotList, listOptions...); err != nil {
 		klog.ErrorS(err, "Failed to list the resourceSnapshots associated with the placement", "placement", placementKey)
@@ -70,10 +68,10 @@ func FetchMasterResourceSnapshot(ctx context.Context, k8Client client.Reader, pl
 			break
 		}
 	}
+	// It is possible that no master resourceSnapshot is found, e.g., when the new resourceSnapshot is created but not yet marked as the latest.
 	if masterResourceSnapshot == nil {
-		klog.V(2).InfoS("Found resourceSnapshots without master snapshot", "placement", placementKey, "resourceSnapshotCount", len(items))
-	} else {
-		klog.V(2).InfoS("Found the latest associated clusterResourceSnapshot", "placement", placementKey, "masterResourceSnapshot", klog.KObj(masterResourceSnapshot))
+		return nil, fmt.Errorf("no masterResourceSnapshot found for the placement %s", placementKey)
 	}
+	klog.V(2).InfoS("Found the latest associated masterResourceSnapshot", "placement", placementKey, "masterResourceSnapshot", klog.KObj(masterResourceSnapshot))
 	return masterResourceSnapshot, nil
 }