Merge pull request #1357 from damdo/sync-crd

OCPBUGS-55417: Resync CRDs

Author: openshift-merge-bot[bot]

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.22.2
 	github.com/onsi/gomega v1.36.2
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20250401163437-6cbf1d70a450
-	github.com/openshift/api v0.0.0-20250305122440-3e04d3af8c3e
+	github.com/openshift/api v0.0.0-20250426060331-e577b4d83475
 	github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a
 	github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250122171707-86066d47a264
 	github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20250128131205-c7b3d7b57a8e

go.sum

@@ -457,8 +457,8 @@ github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jD
 github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20250401163437-6cbf1d70a450 h1:F3D3ly8ZFEVoUTwB1/RYkTevtrCuPKBXsLCHW/73BNE=
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20250401163437-6cbf1d70a450/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
-github.com/openshift/api v0.0.0-20250305122440-3e04d3af8c3e h1:bEcCutNr5RLU/DudWNs/nlOLBqMxrfsHtVuMttkxvWE=
-github.com/openshift/api v0.0.0-20250305122440-3e04d3af8c3e/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
+github.com/openshift/api v0.0.0-20250426060331-e577b4d83475 h1:Iqnp18/voGzmPQTsMHnEPfscYwvPBiUxZUsVhis4EdU=
+github.com/openshift/api v0.0.0-20250426060331-e577b4d83475/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
 github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a h1:duO3JMrUOqVx50QhzxvDeOYIwTNOB8/EEuRLPyvAMBg=
 github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a/go.mod h1:Qw3ThpzVZ0bfTILpBNYg4LGyjtNxfyCiGh/uDLOOTP8=
 github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250122171707-86066d47a264 h1:KoJiId8Ynajf/ZFodvmayFkDODIL7Vow3LmgR5+oVRg=

install/0000_30_machine-api-operator_02_machine.DevPreviewNoUpgrade.crd.yaml

@@ -81,6 +81,20 @@ spec:
           spec:
             description: MachineSpec defines the desired state of Machine
             properties:
+              authoritativeAPI:
+                default: MachineAPI
+                description: |-
+                  authoritativeAPI is the API that is authoritative for this resource.
+                  Valid values are MachineAPI and ClusterAPI.
+                  When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy.
+                  When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy.
+                  Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
+                  Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
+                  To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               lifecycleHooks:
                 description: |-
                   lifecycleHooks allow users to pause operations on the machine at
@@ -364,6 +378,23 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              authoritativeAPI:
+                description: |-
+                  authoritativeAPI is the API that is authoritative for this resource.
+                  Valid values are MachineAPI, ClusterAPI and Migrating.
+                  This value is updated by the migration controller to reflect the authoritative API.
+                  Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
+                  When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                - Migrating
+                type: string
+                x-kubernetes-validations:
+                - message: The authoritativeAPI field must not transition directly
+                    from MachineAPI to ClusterAPI or vice versa. It must transition
+                    through Migrating.
+                  rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
               conditions:
                 description: conditions defines the current state of the Machine
                 items:
@@ -537,7 +568,23 @@ spec:
                   serialized/deserialized from this field.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              synchronizedGeneration:
+                description: |-
+                  synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
+                  This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
+                format: int64
+                minimum: 0
+                type: integer
             type: object
+            x-kubernetes-validations:
+            - fieldPath: .synchronizedGeneration
+              message: synchronizedGeneration must not decrease unless authoritativeAPI
+                is transitioning from Migrating to another value
+              reason: FieldValueInvalid
+              rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
+                && self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
+                || (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
+                != ''Migrating'')'
         type: object
     served: true
     storage: true

install/0000_30_machine-api-operator_02_machine.TechPreviewNoUpgrade.crd.yaml

@@ -81,6 +81,20 @@ spec:
           spec:
             description: MachineSpec defines the desired state of Machine
             properties:
+              authoritativeAPI:
+                default: MachineAPI
+                description: |-
+                  authoritativeAPI is the API that is authoritative for this resource.
+                  Valid values are MachineAPI and ClusterAPI.
+                  When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy.
+                  When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy.
+                  Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
+                  Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
+                  To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               lifecycleHooks:
                 description: |-
                   lifecycleHooks allow users to pause operations on the machine at
@@ -364,6 +378,23 @@ spec:
                   type: object
                 type: array
                 x-kubernetes-list-type: atomic
+              authoritativeAPI:
+                description: |-
+                  authoritativeAPI is the API that is authoritative for this resource.
+                  Valid values are MachineAPI, ClusterAPI and Migrating.
+                  This value is updated by the migration controller to reflect the authoritative API.
+                  Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
+                  When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                - Migrating
+                type: string
+                x-kubernetes-validations:
+                - message: The authoritativeAPI field must not transition directly
+                    from MachineAPI to ClusterAPI or vice versa. It must transition
+                    through Migrating.
+                  rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
               conditions:
                 description: conditions defines the current state of the Machine
                 items:
@@ -537,7 +568,23 @@ spec:
                   serialized/deserialized from this field.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              synchronizedGeneration:
+                description: |-
+                  synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
+                  This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
+                format: int64
+                minimum: 0
+                type: integer
             type: object
+            x-kubernetes-validations:
+            - fieldPath: .synchronizedGeneration
+              message: synchronizedGeneration must not decrease unless authoritativeAPI
+                is transitioning from Migrating to another value
+              reason: FieldValueInvalid
+              rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
+                && self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
+                || (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
+                != ''Migrating'')'
         type: object
     served: true
     storage: true

install/0000_30_machine-api-operator_03_machineset.DevPreviewNoUpgrade.crd.yaml

@@ -66,6 +66,20 @@ spec:
           spec:
             description: MachineSetSpec defines the desired state of MachineSet
             properties:
+              authoritativeAPI:
+                default: MachineAPI
+                description: |-
+                  authoritativeAPI is the API that is authoritative for this resource.
+                  Valid values are MachineAPI and ClusterAPI.
+                  When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy.
+                  When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy.
+                  Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
+                  Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
+                  To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               deletePolicy:
                 description: |-
                   deletePolicy defines the policy used to identify nodes to delete when downscaling.
@@ -267,6 +281,20 @@ spec:
                       Specification of the desired behavior of the machine.
                       More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
                     properties:
+                      authoritativeAPI:
+                        default: MachineAPI
+                        description: |-
+                          authoritativeAPI is the API that is authoritative for this resource.
+                          Valid values are MachineAPI and ClusterAPI.
+                          When set to MachineAPI, writes to the spec of the machine.openshift.io copy of this resource will be reflected into the cluster.x-k8s.io copy.
+                          When set to ClusterAPI, writes to the spec of the cluster.x-k8s.io copy of this resource will be reflected into the machine.openshift.io copy.
+                          Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
+                          Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
+                          To ensure the change has been accepted, please verify that the `status.authoritativeAPI` field has been updated to the desired value and that the `Synchronized` condition is present and set to `True`.
+                        enum:
+                        - MachineAPI
+                        - ClusterAPI
+                        type: string
                       lifecycleHooks:
                         description: |-
                           lifecycleHooks allow users to pause operations on the machine at
@@ -535,6 +563,23 @@ spec:
           status:
             description: MachineSetStatus defines the observed state of MachineSet
             properties:
+              authoritativeAPI:
+                description: |-
+                  authoritativeAPI is the API that is authoritative for this resource.
+                  Valid values are MachineAPI, ClusterAPI and Migrating.
+                  This value is updated by the migration controller to reflect the authoritative API.
+                  Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
+                  When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                - Migrating
+                type: string
+                x-kubernetes-validations:
+                - message: The authoritativeAPI field must not transition directly
+                    from MachineAPI to ClusterAPI or vice versa. It must transition
+                    through Migrating.
+                  rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
               availableReplicas:
                 description: The number of available replicas (ready for at least
                   minReadySeconds) for this MachineSet.
@@ -630,7 +675,23 @@ spec:
                 description: replicas is the most recently observed number of replicas.
                 format: int32
                 type: integer
+              synchronizedGeneration:
+                description: |-
+                  synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
+                  This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
+                format: int64
+                minimum: 0
+                type: integer
             type: object
+            x-kubernetes-validations:
+            - fieldPath: .synchronizedGeneration
+              message: synchronizedGeneration must not decrease unless authoritativeAPI
+                is transitioning from Migrating to another value
+              reason: FieldValueInvalid
+              rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
+                && self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
+                || (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
+                != ''Migrating'')'
         type: object
     served: true
     storage: true