allow resource specification in MCAD CR

Author: MichaelClifford

api/v1alpha1/mcad_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -47,6 +48,11 @@ type MCADSpec struct {
 	// PodCreationTimeout TODO: Add details and confirm values
 	// +kubebuilder:default=-1
 	PodCreationTimeout int `json:"podCreationTimeout,omitempty"`
+	//podCreationTimeout: //int (default blank)
+
+	// ControllerResources TODO: Add details
+	// +kubebuilder:default={}
+	ControllerResources v1.ResourceRequirements `json:"controllerResources,omitempty" protobuf:"bytes,8,opt"`
 }
 
 // MCADStatus defines the observed state of MCAD

api/v1alpha1/zz_generated.deepcopy.go

@@ -38,6 +38,52 @@ spec:
               agentConfigs:
                 description: 'AgentConfigs TODO: Add details'
                 type: string
+              controllerResources:
+                description: 'ControllerResources TODO: Add details'
+                properties:
+                  claims:
+                    description: "Claims lists the names of resources, defined in
+                      spec.resourceClaims, that are used by this container. \n This
+                      is an alpha field and requires enabling the DynamicResourceAllocation
+                      feature gate. \n This field is immutable."
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: Name must match the name of one entry in pod.spec.resourceClaims
+                            of the Pod where this field is used. It makes that resource
+                            available inside a container.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: 'Limits describes the maximum amount of compute resources
+                      allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: 'Requests describes the minimum amount of compute
+                      resources required. If Requests is omitted for a container,
+                      it defaults to Limits if that is explicitly specified, otherwise
+                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                    type: object
+                type: object
               dispatcherMode:
                 default: false
                 description: DispatcherMode determines whether the MCAD Controller

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

@@ -34,13 +34,7 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          resources:
-            limits:
-              cpu: '2'
-              memory: 2Gi
-            requests:
-              cpu: '2'
-              memory: 2Gi
+          resources: {{.ControllerResources}}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           volumeMounts:

config/internal/mcad/deployment.yaml.tmpl

@@ -1,21 +1,38 @@
 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 {
-	Name               string
-	Namespace          string
-	Owner              mf.Owner
-	EnableMonitoring   bool
-	MultiCluster       bool
-	DispatcherMode     bool
-	PreemptionEnabled  bool
-	AgentConfigs       string
-	QuotaRestURL       string
-	PodCreationTimeout int
+	Name                string
+	Namespace           string
+	Owner               mf.Owner
+	EnableMonitoring    bool
+	MultiCluster        bool
+	DispatcherMode      bool
+	PreemptionEnabled   bool
+	AgentConfigs        string
+	QuotaRestURL        string
+	PodCreationTimeout  int
+	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)
+	}
 }
 
 // ExtractParams is currently a straight-up copy. We can add in more complex validation at a later date
@@ -30,6 +47,7 @@ func (p *MCADParams) ExtractParams(mcad *mcadv1alpha1.MCAD) error {
 	p.AgentConfigs = mcad.Spec.AgentConfigs
 	p.QuotaRestURL = mcad.Spec.QuotaRestURL
 	p.PodCreationTimeout = mcad.Spec.PodCreationTimeout
+	p.ControllerResources = ControllerResources{mcad.Spec.ControllerResources}
 
 	return nil
 }

controllers/mcad_params.go

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