fix: disable override controllers for debugging purposes (#784)

Azure · Apr 28, 2024 · a17837e · a17837e
1 parent f72a65a
commit a17837e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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()