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 and default runtime set
+    - name: Should be able to create a minimal ContainerRuntimeConfig
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
@@ -14,4 +14,4 @@ tests:
         kind: ContainerRuntimeConfig
         spec: 
           containerRuntimeConfig:
-            defaultRuntime: ""
+            defaultRuntime: crun

machineconfiguration/v1/types.go

@@ -845,15 +845,14 @@ type ContainerRuntimeConfiguration struct {
 	OverlaySize *resource.Quantity `json:"overlaySize,omitempty"`
 
 	// defaultRuntime is the name of the OCI runtime to be used as the default for containers.
-	// Allowed values are `runc`, `crun`, and omitted (`""`).
+	// Allowed values are `runc` and `crun`.
 	// When set to `runc`, OpenShift will use runc to execute the container
 	// When set to `crun`, OpenShift will use crun to execute the container
 	// 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:=""
+	// +kubebuilder:validation:Enum=crun;runc
 	// +optional
-	DefaultRuntime ContainerRuntimeDefaultRuntime `json:"defaultRuntime"`
+	DefaultRuntime ContainerRuntimeDefaultRuntime `json:"defaultRuntime,omitempty"`
 }
 
 type ContainerRuntimeDefaultRuntime string