From a17837e5ba6d421c10f49010c774da717c73359c Mon Sep 17 00:00:00 2001
From: michaelawyu <chenyu1@microsoft.com>
Date: Sun, 28 Apr 2024 15:57:14 +0800
Subject: [PATCH] fix: disable override controllers for debugging purposes
 (#784)

---
 cmd/hubagent/workload/setup.go | 22 ----------------------
 test/e2e/placement_cro_test.go |  2 ++
 test/e2e/placement_ro_test.go  |  2 ++
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/cmd/hubagent/workload/setup.go b/cmd/hubagent/workload/setup.go
index 94f246c98..a29abb0f1 100644
--- a/cmd/hubagent/workload/setup.go
+++ b/cmd/hubagent/workload/setup.go
@@ -28,7 +28,6 @@ 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"
@@ -287,27 +286,6 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 			klog.ErrorS(err, "Unable to set up memberCluster watcher for scheduler")
 			return err
 		}
-
-		// setup override related controllers
-		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
diff --git a/test/e2e/placement_cro_test.go b/test/e2e/placement_cro_test.go
index 82b5f32d4..6c7b8870a 100644
--- a/test/e2e/placement_cro_test.go
+++ b/test/e2e/placement_cro_test.go
@@ -22,6 +22,8 @@ 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()
 
diff --git a/test/e2e/placement_ro_test.go b/test/e2e/placement_ro_test.go
index bb3290afe..4acb1ac43 100644
--- a/test/e2e/placement_ro_test.go
+++ b/test/e2e/placement_ro_test.go
@@ -24,6 +24,8 @@ 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()