minor fixes

Author: britaniar

pkg/controllers/membercluster/v1beta1/membercluster_controller.go

@@ -673,14 +673,9 @@ func (r *Reconciler) SetupWithManager(mgr runtime.Manager) error {
 		r.agents[clusterv1beta1.ServiceExportImportAgent] = true
 	}
 
-	ctrlmgr := runtime.NewControllerManagedBy(mgr).
+	return runtime.NewControllerManagedBy(mgr).
 		WithOptions(ctrl.Options{MaxConcurrentReconciles: r.MaxConcurrentReconciles, SkipNameValidation: ptr.To(true)}). // set the max number of concurrent reconciles
 		For(&clusterv1beta1.MemberCluster{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
-		Owns(&clusterv1beta1.InternalMemberCluster{})
-
-	if err := ctrlmgr.Complete(r); err != nil {
-		klog.ErrorS(err, "Failed to setup controller")
-		return err
-	}
-	return nil
+		Owns(&clusterv1beta1.InternalMemberCluster{}).
+		Complete(r)
 }

pkg/controllers/rollout/controller_test.go

@@ -11,13 +11,6 @@ import (
 	"testing"
 	"time"
 
-	clusterv1beta1 "go.goms.io/fleet/apis/cluster/v1beta1"
-	fleetv1alpha1 "go.goms.io/fleet/apis/placement/v1alpha1"
-	fleetv1beta1 "go.goms.io/fleet/apis/placement/v1beta1"
-	"go.goms.io/fleet/pkg/controllers/work"
-	"go.goms.io/fleet/pkg/utils/condition"
-	"go.goms.io/fleet/pkg/utils/controller"
-
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	corev1 "k8s.io/api/core/v1"
@@ -30,6 +23,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllertest"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	clusterv1beta1 "go.goms.io/fleet/apis/cluster/v1beta1"
+	fleetv1alpha1 "go.goms.io/fleet/apis/placement/v1alpha1"
+	fleetv1beta1 "go.goms.io/fleet/apis/placement/v1beta1"
+	"go.goms.io/fleet/pkg/controllers/work"
+	"go.goms.io/fleet/pkg/utils/condition"
+	"go.goms.io/fleet/pkg/utils/controller"
 )
 
 var (

test/e2e/rollout_test.go

@@ -353,7 +353,7 @@ var _ = Describe("placing wrapped resources using a CRP", Ordered, func() {
 
 		It("should update CRP status as expected", func() {
 			crpStatusUpdatedActual := customizedCRPStatusUpdatedActual(crpName, wantSelectedResources, allMemberClusterNames, nil, "0", true)
-			Eventually(crpStatusUpdatedActual, 2*workloadEventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update CRP status as expected")
+			Eventually(crpStatusUpdatedActual, 3*workloadEventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to update CRP status as expected")
 		})
 
 		It("should place the resources on all member clusters", func() {