OCPNODE-3372: Remove omitempty from defaultRuntime as its handled in MCO with additional test cases

Author: ngopalak-redhat

machineconfiguration/v1/tests/containerruntimeconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml

@@ -3,7 +3,7 @@ name: "ContainerRuntimeConfig"
 crdName: containerruntimeconfigs.machineconfiguration.openshift.io
 tests:
   onCreate:
-    - name: Should be able to create a minimal ContainerRuntimeConfig
+    - name: Should be able to create a minimal ContainerRuntimeConfig and default runtime set
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
@@ -13,4 +13,5 @@ tests:
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec: 
-          containerRuntimeConfig: {}
+          containerRuntimeConfig:
+            defaultRuntime: ""

machineconfiguration/v1/tests/containerruntimeconfigs.machineconfiguration.openshift.io/DefaultRuntimeConfig.yaml

@@ -28,6 +28,7 @@ tests:
         kind: ContainerRuntimeConfig
         spec: 
           containerRuntimeConfig:
+            defaultRuntime: ""
             logLevel: info
     - name: Should fail if set to a number
       initial: |
@@ -66,35 +67,85 @@ tests:
         spec: 
           containerRuntimeConfig:
             defaultRuntime: crun
-    - name: Should be able to set runc in ContainerRuntimeConfig
+    - name: Should be able to set runc in ContainerRuntimeConfig with other params
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:  
           containerRuntimeConfig:
             defaultRuntime: runc
+            logLevel: info
       expected: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec: 
           containerRuntimeConfig:
             defaultRuntime: runc
-    - name: Should be able to set other parameters
+            logLevel: info
+  onUpdate:
+    - name: Should not be able to update from default to invalid value
+      initialCRDPatches:
+        - op: remove
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/containerRuntimeConfig/properties/defaultRuntime/enum
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: runc
+            defaultRuntime: ""
+            logLevel: fatal
+      updated: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: ContainerRuntimeConfig
+        spec:
+          containerRuntimeConfig:
+            defaultRuntime: docker
+            logLevel: info
+      expectedError: "Unsupported value: \"docker\": supported values: \"crun\", \"runc\", \"\""
+    - name: Should be able to update from not set to default when other params are set
+      initial: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: ContainerRuntimeConfig
+        spec:
+          containerRuntimeConfig: {}
+      updated: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: ContainerRuntimeConfig
+        spec:
+          containerRuntimeConfig:
             logLevel: info
       expected: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: ContainerRuntimeConfig
+        spec:
+          containerRuntimeConfig:
+            defaultRuntime: ""
+            logLevel: info
+    - name: Should be able to update from runc to crun with other parameters
+      initialCRDPatches:
+        - op: remove
+          path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/containerRuntimeConfig/properties/defaultRuntime/enum
+      initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
             defaultRuntime: runc
+            logLevel: fatal
+      updated: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: ContainerRuntimeConfig
+        spec:
+          containerRuntimeConfig:
+            defaultRuntime: crun
+            logLevel: info
+      expected: |
+        apiVersion: machineconfiguration.openshift.io/v1
+        kind: ContainerRuntimeConfig
+        spec:
+          containerRuntimeConfig:
+            defaultRuntime: crun
             logLevel: info
-  onUpdate:
     - name: Should be able to update other parameters with invalid defaultRuntime
       initialCRDPatches:
         - op: remove

machineconfiguration/v1/types.go

@@ -851,8 +851,9 @@ type ContainerRuntimeConfiguration struct {
 	// When omitted, this means no opinion and the platform is left to choose a reasonable default,
 	// which is subject to change over time. Currently, the default is `crun`.
 	// +kubebuilder:validation:Enum=crun;runc;""
+	// +kubebuilder:default:=""
 	// +optional
-	DefaultRuntime ContainerRuntimeDefaultRuntime `json:"defaultRuntime,omitempty"`
+	DefaultRuntime ContainerRuntimeDefaultRuntime `json:"defaultRuntime"`
 }
 
 type ContainerRuntimeDefaultRuntime string

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml

@@ -53,6 +53,7 @@ spec:
                   runtime.
                 properties:
                   defaultRuntime:
+                    default: ""
                     description: |-
                       defaultRuntime is the name of the OCI runtime to be used as the default for containers.
                       Allowed values are `runc`, `crun`, and omitted (`""`).

machineconfiguration/v1/zz_generated.featuregated-crd-manifests/containerruntimeconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml

@@ -54,6 +54,7 @@ spec:
                   runtime.
                 properties:
                   defaultRuntime:
+                    default: ""
                     description: |-
                       defaultRuntime is the name of the OCI runtime to be used as the default for containers.
                       Allowed values are `runc`, `crun`, and omitted (`""`).

payload-manifests/crds/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml

@@ -53,6 +53,7 @@ spec:
                   runtime.
                 properties:
                   defaultRuntime:
+                    default: ""
                     description: |-
                       defaultRuntime is the name of the OCI runtime to be used as the default for containers.
                       Allowed values are `runc`, `crun`, and omitted (`""`).