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

Author: ngopalak-redhat

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

@@ -13,4 +13,4 @@ tests:
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec: 
-          containerRuntimeConfig: {}
+          containerRuntimeConfig: {}

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

@@ -77,7 +77,7 @@ tests:
             defaultRuntime: runc
             logLevel: info
   onUpdate:
-    - name: Should not be able to update from default to invalid value
+    - name: Case 1 - Change another field - Should be able to update other parameters with invalid defaultRuntime
       initialCRDPatches:
         - op: remove
           path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/containerRuntimeConfig/properties/defaultRuntime/enum
@@ -86,7 +86,7 @@ tests:
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: crun
+            defaultRuntime: docker
             logLevel: fatal
       updated: |
         apiVersion: machineconfiguration.openshift.io/v1
@@ -95,26 +95,14 @@ tests:
           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: docker
             logLevel: info
-    - name: Should be able to update from runc to crun with other parameters
+    - name: Case 2 - Remove the field - Should be able to update from invalid to removed
       initialCRDPatches:
         - op: remove
           path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/containerRuntimeConfig/properties/defaultRuntime/enum
@@ -123,23 +111,18 @@ tests:
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: runc
-            logLevel: fatal
+            defaultRuntime: docker
       updated: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:
-          containerRuntimeConfig:
-            defaultRuntime: crun
-            logLevel: info
+          containerRuntimeConfig: {}
       expected: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:
-          containerRuntimeConfig:
-            defaultRuntime: crun
-            logLevel: info
-    - name: Should be able to update other parameters with invalid defaultRuntime
+          containerRuntimeConfig: {}
+    - name: Case 3 - Update the field - Should be able to update from invalid to correct value
       initialCRDPatches:
         - op: remove
           path: /spec/versions/0/schema/openAPIV3Schema/properties/spec/properties/containerRuntimeConfig/properties/defaultRuntime/enum
@@ -149,18 +132,15 @@ tests:
         spec:
           containerRuntimeConfig:
             defaultRuntime: docker
-            logLevel: fatal
       updated: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: docker
-            logLevel: info
+            defaultRuntime: runc
       expected: |
         apiVersion: machineconfiguration.openshift.io/v1
         kind: ContainerRuntimeConfig
         spec:
           containerRuntimeConfig:
-            defaultRuntime: docker
-            logLevel: info
+            defaultRuntime: runc