From 102863dd29fa3eda745cf5014775a71045a8be73 Mon Sep 17 00:00:00 2001
From: Anish Asthana <anishasthana1@gmail.com>
Date: Thu, 4 Apr 2024 16:03:29 -0400
Subject: [PATCH] Disable MCAD by default

Signed-off-by: Anish Asthana <anishasthana1@gmail.com>
---
 main.go              | 15 +++++++++------
 pkg/config/config.go |  4 +++-
 test/e2e/setup.sh    | 10 ++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index 04cd33ec2..42cc5a3e2 100644
--- a/main.go
+++ b/main.go
@@ -127,7 +127,8 @@ func main() {
 			},
 			LeaderElection: &configv1alpha1.LeaderElectionConfiguration{},
 		},
-		MCAD: &mcadconfig.MCADConfiguration{},
+		MCADEnabled: pointer.Bool(false),
+		MCAD:        &mcadconfig.MCADConfiguration{},
 		InstaScale: &config.InstaScaleConfiguration{
 			Enabled: pointer.Bool(false),
 			InstaScaleConfiguration: instascaleconfig.InstaScaleConfiguration{
@@ -167,12 +168,14 @@ func main() {
 	})
 	exitOnError(err, "unable to start manager")
 
-	mcadQueueController := mcad.NewJobController(mgr.GetConfig(), cfg.MCAD, &mcadconfig.MCADConfigurationExtended{})
-	if mcadQueueController == nil {
-		// FIXME: update NewJobController so it follows Go idiomatic error handling and return an error instead of a nil object
-		os.Exit(1)
+	if pointer.BoolDeref(cfg.MCADEnabled, false) {
+		mcadQueueController := mcad.NewJobController(mgr.GetConfig(), cfg.MCAD, &mcadconfig.MCADConfigurationExtended{})
+		if mcadQueueController == nil {
+			// FIXME: update NewJobController so it follows Go idiomatic error handling and return an error instead of a nil object
+			os.Exit(1)
+		}
+		mcadQueueController.Run(ctx.Done())
 	}
-	mcadQueueController.Run(ctx.Done())
 
 	if pointer.BoolDeref(cfg.InstaScale.Enabled, false) {
 		instaScaleController := &instascale.AppWrapperReconciler{
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 10b547676..36234a3c6 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -32,7 +32,9 @@ type CodeFlareOperatorConfiguration struct {
 	ControllerManager `json:",inline"`
 
 	// The MCAD controller configuration
-	MCAD *mcad.MCADConfiguration `json:"mcad,omitempty"`
+	// MCADEnabled defaults to false
+	MCADEnabled *bool                   `json:"mcadEnabled,omitempty"`
+	MCAD        *mcad.MCADConfiguration `json:"mcad,omitempty"`
 
 	// The InstaScale controller configuration
 	InstaScale *InstaScaleConfiguration `json:"instascale,omitempty"`
diff --git a/test/e2e/setup.sh b/test/e2e/setup.sh
index d5c99cbf8..1f8922aa8 100755
--- a/test/e2e/setup.sh
+++ b/test/e2e/setup.sh
@@ -56,3 +56,13 @@ roleRef:
   kind: ClusterRole
   name: mcad-controller-rayclusters
 EOF
+
+cat <<EOF | kubectl apply -f -
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: codeflare-operator-config
+data:
+  config.yaml: |
+    mcadEnabled: true
+EOF