Merge pull request #2201 from isabella-janssen/update-mcn-v1alpha1-api

MCO-1543: Update v1alpha1 MCN API

Author: openshift-merge-bot[bot]

machineconfiguration/v1alpha1/tests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml

@@ -156,7 +156,7 @@ tests:
               currentGeneration: 2
               desiredGeneration: 1
       expectedStatusError: "Invalid value: \"object\": desired generation must be greater than or equal to the current generation"
-    - name: PinnedImageSet desired generation must be greater than last failed generation
+    - name: PinnedImageSet desired generation must be greater than or equal to the last failed generation
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1alpha1
         kind: MachineConfigNode
@@ -179,7 +179,6 @@ tests:
             - name: test-pinned-image-set
               currentGeneration: 2
               desiredGeneration: 2
-              lastFailedGeneration: 1
       updated: |
         apiVersion: machineconfiguration.openshift.io/v1alpha1
         kind: MachineConfigNode
@@ -203,8 +202,8 @@ tests:
               currentGeneration: 3
               desiredGeneration: 3
               lastFailedGeneration: 4
-      expectedStatusError: "Invalid value: \"object\": desired generation must be greater than last failed generation"
-    - name: PinnedImageSet desired generation must be set if last failed generation is set
+      expectedStatusError: "Invalid value: \"object\": desired generation must be greater than or equal to the last failed generation"
+    - name: PinnedImageSet last failed generation error must be defined on image pull and pin failure
       initial: |
         apiVersion: machineconfiguration.openshift.io/v1alpha1
         kind: MachineConfigNode
@@ -225,6 +224,8 @@ tests:
             desired: rendered-worker-abc
           pinnedImageSets:
             - name: test-pinned-image-set
+              currentGeneration: 2
+              desiredGeneration: 2
       updated: |
         apiVersion: machineconfiguration.openshift.io/v1alpha1
         kind: MachineConfigNode
@@ -245,5 +246,7 @@ tests:
             desired: rendered-worker-abc
           pinnedImageSets:
             - name: test-pinned-image-set
-              lastFailedGeneration: 2
-      expectedStatusError: "Invalid value: \"object\": desired generation must be defined if last failed generation is defined"
+              currentGeneration: 2
+              desiredGeneration: 3
+              lastFailedGeneration: 3
+      expectedStatusError: "Invalid value: \"object\": last failed generation error must be defined on image pull and pin failure"

machineconfiguration/v1alpha1/types_machineconfignode.go

@@ -1,6 +1,6 @@
 machineconfignodes.machineconfiguration.openshift.io:
   Annotations: {}
-  ApprovedPRNumber: https://github.com/openshift/api/pull/1596
+  ApprovedPRNumber: https://github.com/openshift/api/pull/2201
   CRDName: machineconfignodes.machineconfiguration.openshift.io
   Capability: ""
   Category: ""
@@ -48,10 +48,6 @@ machineconfignodes.machineconfiguration.openshift.io:
     name: Resumed
     priority: 1
     type: string
-  - jsonPath: .status.conditions[?(@.type=="UpdateCompatible")].status
-    name: UpdateCompatible
-    priority: 1
-    type: string
   - jsonPath: .status.conditions[?(@.type=="AppliedFilesAndOS")].status
     name: UpdatedFilesAndOS
     priority: 1
@@ -68,10 +64,6 @@ machineconfignodes.machineconfiguration.openshift.io:
     name: RebootedNode
     priority: 1
     type: string
-  - jsonPath: .status.conditions[?(@.type=="ReloadedCRIO")].status
-    name: ReloadedCRIO
-    priority: 1
-    type: string
   - jsonPath: .status.conditions[?(@.type=="Uncordoned")].status
     name: UncordonedNode
     priority: 1