Enable MCAD in e2e tests

Author: astefanutti

config/e2e/config.yaml

@@ -0,0 +1,8 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: codeflare-operator-config
+data:
+  config.yaml: |
+    mcad:
+      enabled: true

config/e2e/kustomization.yaml

@@ -1,6 +1,7 @@
 namespace: openshift-operators
 
 bases:
+- config.yaml
 - ../default
 
 patches:

main.go

@@ -127,8 +127,9 @@ func main() {
 			},
 			LeaderElection: &configv1alpha1.LeaderElectionConfiguration{},
 		},
-		MCADEnabled: pointer.Bool(false),
-		MCAD:        &mcadconfig.MCADConfiguration{},
+		MCAD: &config.MCADConfiguration{
+			Enabled: pointer.Bool(false),
+		},
 		InstaScale: &config.InstaScaleConfiguration{
 			Enabled: pointer.Bool(false),
 			InstaScaleConfiguration: instascaleconfig.InstaScaleConfiguration{
@@ -168,8 +169,8 @@ func main() {
 	})
 	exitOnError(err, "unable to start manager")
 
-	if pointer.BoolDeref(cfg.MCADEnabled, false) {
-		mcadQueueController := mcad.NewJobController(mgr.GetConfig(), cfg.MCAD, &mcadconfig.MCADConfigurationExtended{})
+	if pointer.BoolDeref(cfg.MCAD.Enabled, false) {
+		mcadQueueController := mcad.NewJobController(mgr.GetConfig(), &cfg.MCAD.MCADConfiguration, &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)

pkg/config/config.go

@@ -32,9 +32,7 @@ type CodeFlareOperatorConfiguration struct {
 	ControllerManager `json:",inline"`
 
 	// The MCAD controller configuration
-	// MCADEnabled defaults to false
-	MCADEnabled *bool                   `json:"mcadEnabled,omitempty"`
-	MCAD        *mcad.MCADConfiguration `json:"mcad,omitempty"`
+	MCAD *MCADConfiguration `json:"mcad,omitempty"`
 
 	// The InstaScale controller configuration
 	InstaScale *InstaScaleConfiguration `json:"instascale,omitempty"`
@@ -46,6 +44,15 @@ type KubeRayConfiguration struct {
 	RayDashboardOAuthEnabled *bool `json:"rayDashboardOAuthEnabled,omitempty"`
 }
 
+type MCADConfiguration struct {
+	// enabled controls whether the MCAD controller is started.
+	// It defaults to false.
+	Enabled *bool `json:"enabled,omitempty"`
+
+	// The InstaScale controller configuration
+	mcad.MCADConfiguration `json:",inline,omitempty"`
+}
+
 type InstaScaleConfiguration struct {
 	// enabled controls whether the InstaScale controller is started.
 	// It may default to true on platforms that InstaScale supports.

test/e2e/setup.sh

@@ -56,13 +56,3 @@ 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