OCPNODE-3372: Readd omitempty for defaultRuntime as its handled in MCO with additional test cases

Author: ngopalak-redhat

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

@@ -3,19 +3,14 @@ name: "ContainerRuntimeConfig"
 crdName: containerruntimeconfigs.machineconfiguration.openshift.io
 tests:
   onCreate:
-    - name: Should not fail if set to empty string
+    - name: Should fail if set to empty string
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:  
           containerRuntimeConfig:
             defaultRuntime: ""
-      expected: |
-        apiVersion: machineconfiguration.openshift.io/v1
-        kind: ContainerRuntimeConfig
-        spec: 
-          containerRuntimeConfig:
-            defaultRuntime: ""
+      expectedError: "spec.containerRuntimeConfig.defaultRuntime: Unsupported value: \"\": supported values: \"crun\", \"runc\""
     - name: Should not fail if not set and other fields set
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
@@ -28,7 +23,6 @@ tests:
         kind: ContainerRuntimeConfig
         spec: 
           containerRuntimeConfig:
-            defaultRuntime: ""
             logLevel: info
     - name: Should fail if set to a number
       initial: |
@@ -37,23 +31,23 @@ tests:
         spec:  
           containerRuntimeConfig:
             defaultRuntime: 1234
-      expectedError: "spec.containerRuntimeConfig.defaultRuntime: Invalid value: \"integer\": spec.containerRuntimeConfig.defaultRuntime in body must be of type string: \"integer\", spec.containerRuntimeConfig.defaultRuntime: Unsupported value: 1234: supported values: \"crun\", \"runc\", \"\""
+      expectedError: "spec.containerRuntimeConfig.defaultRuntime: Invalid value: \"integer\": spec.containerRuntimeConfig.defaultRuntime in body must be of type string: \"integer\", spec.containerRuntimeConfig.defaultRuntime: Unsupported value: 1234: supported values: \"crun\", \"runc\""
     - name: Should fail if set to a blank string
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:  
           containerRuntimeConfig:
             defaultRuntime: "    "
-      expectedError: "Unsupported value: \"    \": supported values: \"crun\", \"runc\", \"\""
+      expectedError: "Unsupported value: \"    \": supported values: \"crun\", \"runc\""
     - name: Should fail if invalid ContainerRuntimeConfig is provided
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:  
           containerRuntimeConfig:
             defaultRuntime: docker
-      expectedError: "Unsupported value: \"docker\": supported values: \"crun\", \"runc\", \"\""
+      expectedError: "Unsupported value: \"docker\": supported values: \"crun\", \"runc\""
     - name: Should be able to set crun in ContainerRuntimeConfig
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1
@@ -92,7 +86,7 @@ tests:
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: ""
+            defaultRuntime: crun
             logLevel: fatal
       updated: |
         apiVersion: machineconfiguration.openshift.io/v1
@@ -101,7 +95,7 @@ tests:
           containerRuntimeConfig:
             defaultRuntime: docker
             logLevel: info
-      expectedError: "Unsupported value: \"docker\": supported values: \"crun\", \"runc\", \"\""
+      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
@@ -119,7 +113,6 @@ tests:
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: ""
             logLevel: info
     - name: Should be able to update from runc to crun with other parameters
       initialCRDPatches:

machineconfiguration/v1/types.go

@@ -850,7 +850,7 @@ type ContainerRuntimeConfiguration struct {
 	// 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:validation:Enum=crun;runc
 	// +optional
 	DefaultRuntime ContainerRuntimeDefaultRuntime `json:"defaultRuntime,omitempty"`
 }

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

@@ -53,18 +53,16 @@ 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 (`""`).
+                      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`.
                     enum:
                     - crun
                     - runc
-                    - ""
                     type: string
                   logLevel:
                     description: |-

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

@@ -54,18 +54,16 @@ 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 (`""`).
+                      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`.
                     enum:
                     - crun
                     - runc
-                    - ""
                     type: string
                   logLevel:
                     description: |-