add test case for defining MCAD resources

Author: MichaelClifford

api/v1alpha1/mcad_types.go

@@ -50,7 +50,7 @@ type MCADSpec struct {
 	PodCreationTimeout int `json:"podCreationTimeout,omitempty"`
 	//podCreationTimeout: //int (default blank)
 
-	// ControllerResources TODO: Add details
+	// ControllerResources defines the cpu and memory resource requirements for the MCAD Controller
 	// +kubebuilder:default={}
 	ControllerResources v1.ResourceRequirements `json:"controllerResources,omitempty" protobuf:"bytes,8,opt"`
 }

config/crd/bases/codeflare.codeflare.dev_mcads.yaml

@@ -39,7 +39,8 @@ spec:
                 description: 'AgentConfigs TODO: Add details'
                 type: string
               controllerResources:
-                description: 'ControllerResources TODO: Add details'
+                description: ControllerResources defines the cpu and memory resource
+                  requirements for the MCAD Controller
                 properties:
                   claims:
                     description: "Claims lists the names of resources, defined in

controllers/mcad_controller_test.go

@@ -15,9 +15,6 @@ const (
 	mcadConfigMap1      = "./testdata/mcad_test_results/case_1/configmap.yaml"
 	mcadService1        = "./testdata/mcad_test_results/case_1/service.yaml"
 	mcadServiceAccount1 = "./testdata/mcad_test_results/case_1/serviceaccount.yaml"
-)
-
-const (
 	mcadCRCase2         = "./testdata/mcad_test_cases/case_2.yaml"
 	mcadConfigMap2      = "./testdata/mcad_test_results/case_2/configmap.yaml"
 	mcadService2        = "./testdata/mcad_test_results/case_2/service.yaml"

controllers/mcad_params.go

@@ -1,11 +1,8 @@
 package controllers
 
 import (
-	"encoding/json"
-
 	mf "github.com/manifestival/manifestival"
 	mcadv1alpha1 "github.com/project-codeflare/codeflare-operator/api/v1alpha1"
-	v1 "k8s.io/api/core/v1"
 )
 
 type MCADParams struct {
@@ -22,18 +19,9 @@ type MCADParams struct {
 	ControllerResources ControllerResources
 }
 
-type ControllerResources struct {
-	v1.ResourceRequirements
-}
-
-func (c *ControllerResources) String() string {
-	raw, err := json.Marshal(c)
-	if err != nil {
-		return "{}"
-	} else {
-		return string(raw)
-	}
-}
+// type ControllerResources struct {
+// 	v1.ResourceRequirements
+// }
 
 // ExtractParams is currently a straight-up copy. We can add in more complex validation at a later date
 func (p *MCADParams) ExtractParams(mcad *mcadv1alpha1.MCAD) error {

controllers/testdata/mcad_test_cases/case_1.yaml

@@ -2,11 +2,4 @@ apiVersion: codeflare.codeflare.dev/v1alpha1
 kind: MCAD
 metadata:
   name: blank-custom-resource
-spec:
-  controllerResources:
-    limits:
-      cpu: '2'
-      memory: 2G
-    requests:
-      cpu: '2'
-      memory: 2G
+spec: {}

controllers/testdata/mcad_test_cases/case_2.yaml

@@ -6,3 +6,10 @@ spec:
   podCreationTimeout: 300
   quotaRestURL: 'bar.com'
   agentConfigs: 'foo'
+  controllerResources:
+    limits:
+      cpu: '2'
+      memory: 2G
+    requests:
+      cpu: '2'
+      memory: 2G