fix: re-enable override controllers + add necessary CRD checks (#785)

cmd/hubagent/workload/setup.go

@@ -20,6 +20,7 @@ import (
 	workv1alpha1 "sigs.k8s.io/work-api/pkg/apis/v1alpha1"
 
 	clusterv1beta1 "go.goms.io/fleet/apis/cluster/v1beta1"
+	placementv1alpha1 "go.goms.io/fleet/apis/placement/v1alpha1"
 	placementv1beta1 "go.goms.io/fleet/apis/placement/v1beta1"
 	fleetv1alpha1 "go.goms.io/fleet/apis/v1alpha1"
 	"go.goms.io/fleet/cmd/hubagent/options"
@@ -28,6 +29,7 @@ import (
 	"go.goms.io/fleet/pkg/controllers/clusterresourceplacementwatcher"
 	"go.goms.io/fleet/pkg/controllers/clusterschedulingpolicysnapshot"
 	"go.goms.io/fleet/pkg/controllers/memberclusterplacement"
+	"go.goms.io/fleet/pkg/controllers/overrider"
 	"go.goms.io/fleet/pkg/controllers/resourcechange"
 	"go.goms.io/fleet/pkg/controllers/rollout"
 	"go.goms.io/fleet/pkg/controllers/workgenerator"
@@ -73,6 +75,10 @@ var (
 		placementv1beta1.GroupVersion.WithKind(placementv1beta1.ClusterResourceSnapshotKind),
 		placementv1beta1.GroupVersion.WithKind(placementv1beta1.ClusterSchedulingPolicySnapshotKind),
 		placementv1beta1.GroupVersion.WithKind(placementv1beta1.WorkKind),
+		placementv1alpha1.GroupVersion.WithKind(placementv1alpha1.ClusterResourceOverrideKind),
+		placementv1alpha1.GroupVersion.WithKind(placementv1alpha1.ClusterResourceOverrideSnapshotKind),
+		placementv1alpha1.GroupVersion.WithKind(placementv1alpha1.ResourceOverrideKind),
+		placementv1alpha1.GroupVersion.WithKind(placementv1alpha1.ResourceOverrideSnapshotKind),
 	}
 )
 
@@ -85,11 +91,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 	}
 
 	discoverClient := discovery.NewDiscoveryClientForConfigOrDie(config)
-	if err != nil {
-		klog.ErrorS(err, "unable to create the discover client")
-		return err
-	}
-
 	// Verify CRD installation status.
 	if opts.EnableV1Alpha1APIs {
 		for _, gvk := range v1Alpha1RequiredGVKs {
@@ -286,6 +287,27 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 			klog.ErrorS(err, "Unable to set up memberCluster watcher for scheduler")
 			return err
 		}
+
+		// Set up the controllers for overriding resources.
+		klog.Info("Setting up the clusterResourceOverride controller")
+		if err := (&overrider.ClusterResourceReconciler{
+			Reconciler: overrider.Reconciler{
+				Client: mgr.GetClient(),
+			},
+		}).SetupWithManager(mgr); err != nil {
+			klog.ErrorS(err, "Unable to set up clusterResourceOverride controller")
+			return err
+		}
+
+		klog.Info("Setting up the resourceOverride controller")
+		if err := (&overrider.ResourceReconciler{
+			Reconciler: overrider.Reconciler{
+				Client: mgr.GetClient(),
+			},
+		}).SetupWithManager(mgr); err != nil {
+			klog.ErrorS(err, "Unable to set up resourceOverride controller")
+			return err
+		}
 	}
 
 	// Set up a runner that starts all the custom controllers we created above

test/e2e/placement_cro_test.go

@@ -22,8 +22,6 @@ var _ = Describe("creating clusterResourceOverride (selecting all clusters) to o
 	croName := fmt.Sprintf(croNameTemplate, GinkgoParallelProcess())
 
 	BeforeAll(func() {
-		Skip("CRO controller is not enabled yet")
-
 		By("creating work resources")
 		createWorkResources()
 

test/e2e/placement_ro_test.go

@@ -24,8 +24,6 @@ var _ = Describe("creating resourceOverride (selecting all clusters) to override
 	roNamespace := fmt.Sprintf(workNamespaceNameTemplate, GinkgoParallelProcess())
 
 	BeforeAll(func() {
-		Skip("RO controller is not enabled yet")
-
 		By("creating work resources")
 		createWorkResources()