Don't add default values to config map if not specified.

This allows MCAD to determine what an undefined value means

Signed-off-by: Kevin <[email protected]>

Author: KPostOffice

api/v1alpha1/mcad_types.go

@@ -39,18 +39,14 @@ type MCADSpec struct {
 	PreemptionEnabled bool `json:"preemptionEnabled,omitempty"`
 
 	// AgentConfigs TODO: Add details
-	// +kubebuilder:default=null
 	AgentConfigs string `json:"agentConfigs,omitempty"`
 
 	// QuotaRestURL TODO: Add details
-	// +kubebuilder:default=null
 	QuotaRestURL string `json:"quotaRestURL,omitempty"`
 
 	// PodCreationTimeout TODO: Add details and confirm values
-	// +kubebuilder:default=300
+	// +kubebuilder:default=-1
 	PodCreationTimeout int `json:"podCreationTimeout,omitempty"`
-	//podCreationTimeout: //int (default blank)
-
 }
 
 // MCADStatus defines the observed state of MCAD

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

@@ -36,7 +36,6 @@ spec:
             description: MCADSpec defines the desired state of MCAD
             properties:
               agentConfigs:
-                default: "null"
                 description: 'AgentConfigs TODO: Add details'
                 type: string
               dispatcherMode:
@@ -55,7 +54,7 @@ spec:
                   to multiple clusters.
                 type: boolean
               podCreationTimeout:
-                default: 300
+                default: -1
                 description: 'PodCreationTimeout TODO: Add details and confirm values'
                 type: integer
               preemptionEnabled:
@@ -64,7 +63,6 @@ spec:
                   preempted for others
                 type: boolean
               quotaRestURL:
-                default: "null"
                 description: 'QuotaRestURL TODO: Add details'
                 type: string
             type: object

config/internal/mcad/configmap.yaml.tmpl

@@ -1,10 +1,10 @@
 apiVersion: v1
 data:
   DISPATCHER_MODE: "{{.DispatcherMode}}"
-  DISPATCHER_AGENT_CONFIGS: "{{.AgentConfigs}}"
   PREEMPTION: "{{.PreemptionEnabled}}"
-  QUOTA_REST_URL: "{{.QuotaRestURL}}"
-  DISPATCH_RESOURCE_RESERVATION_TIMEOUT: "{{.PodCreationTimeout}}"
+  {{if ne .AgentConfigs ""}}DISPATCHER_AGENT_CONFIGS: "{{.AgentConfigs}}"{{end}}
+  {{if ne .QuotaRestURL ""}}QUOTA_REST_URL: "{{.QuotaRestURL}}"{{end}}
+  {{if ne .PodCreationTimeout -1}}DISPATCH_RESOURCE_RESERVATION_TIMEOUT: "{{.PodCreationTimeout}}"{{end}}
 kind: ConfigMap
 metadata:
   name: mcad-{{.Name}}-config

controllers/mcad_controller.go

@@ -47,7 +47,6 @@ type MCADReconciler struct {
 }
 
 func (r *MCADReconciler) Apply(owner mf.Owner, params *MCADParams, template string, fns ...mf.Transformer) error {
-
 	tmplManifest, err := config.Manifest(r.Client, r.TemplatesPath+template, params, template, r.Log)
 	if err != nil {
 		return fmt.Errorf("error loading template yaml: %w", err)
@@ -84,6 +83,7 @@ func (r *MCADReconciler) ApplyWithoutOwner(params *MCADParams, template string,
 	if err = tmplManifest.Apply(); err != nil {
 		return err
 	}
+
 	return nil
 }
 

controllers/mcad_controller_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+
 	mfc "github.com/manifestival/controller-runtime-client"
 	mf "github.com/manifestival/manifestival"
 	. "github.com/onsi/ginkgo/v2"
@@ -16,6 +17,13 @@ const (
 	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"
+	mcadServiceAccount2 = "./testdata/mcad_test_results/case_2/serviceaccount.yaml"
+)
+
 func deployMCAD(ctx context.Context, path string, opts mf.Option) {
 	mcad := &codeflarev1alpha1.MCAD{}
 	err := convertToStructuredResource(path, mcad, opts)
@@ -38,4 +46,13 @@ var _ = Describe("The MCAD Controller", func() {
 		})
 	})
 
+	Context("In a namespace, when a populated MCAD Custom Resource is deployed", func() {
+
+		It("It should create a configmap", func() {
+			deployMCAD(ctx, mcadCRCase2, opts)
+			compareConfigMaps(mcadConfigMap2, opts)
+			compareServiceAccounts(mcadServiceAccount2, opts)
+			compareServices(mcadService2, opts)
+		})
+	})
 })

controllers/testdata/mcad_test_cases/case_2.yaml

@@ -0,0 +1,8 @@
+apiVersion: codeflare.codeflare.dev/v1alpha1
+kind: MCAD
+metadata:
+  name: populated-custom-resource
+spec:
+  podCreationTimeout: 300
+  quotaRestURL: 'bar.com'
+  agentConfigs: 'foo'

controllers/testdata/mcad_test_results/case_1/configmap.yaml

@@ -7,8 +7,5 @@ metadata:
     app: mcad-blank-custom-resource
     component: multi-cluster-app-dispatcher
 data:
-  DISPATCHER_AGENT_CONFIGS: 'null'
   DISPATCHER_MODE: 'false'
-  DISPATCH_RESOURCE_RESERVATION_TIMEOUT: '300'
   PREEMPTION: 'false'
-  QUOTA_REST_URL: 'null'

controllers/testdata/mcad_test_results/case_2/configmap.yaml

@@ -0,0 +1,14 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: mcad-populated-custom-resource-config
+  namespace: default
+  labels:
+    app: mcad-populated-custom-resource
+    component: multi-cluster-app-dispatcher
+data:
+  DISPATCHER_MODE: 'false'
+  PREEMPTION: 'false'
+  DISPATCHER_AGENT_CONFIGS: 'foo'
+  DISPATCH_RESOURCE_RESERVATION_TIMEOUT: '300'
+  QUOTA_REST_URL: 'bar.com'

controllers/testdata/mcad_test_results/case_2/rolebinding.yaml

@@ -0,0 +1,13 @@
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: populated-custom-resource-custom-metrics-auth-reader
+  namespace: default
+subjects:
+  - kind: ServiceAccount
+    name: mcad-controller-populated-custom-resource
+    namespace: default
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader

controllers/testdata/mcad_test_results/case_2/service.yaml

@@ -0,0 +1,26 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: mcad-populated-custom-resource-metrics
+  namespace: default
+spec:
+  clusterIP: 172.31.181.101
+  ipFamilies:
+    - IPv4
+  ports:
+    - name: https
+      protocol: TCP
+      port: 443
+      targetPort: 6443
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 8080
+  internalTrafficPolicy: Cluster
+  clusterIPs:
+    - 172.31.181.101
+  type: ClusterIP
+  ipFamilyPolicy: SingleStack
+  sessionAffinity: None
+  selector:
+    app: mcad-populated-custom-resource

controllers/testdata/mcad_test_results/case_2/serviceaccount.yaml

@@ -0,0 +1,5 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: mcad-controller-populated-custom-resource
+  namespace: default