Merge pull request #2642 from RadekManak/synchronizedAPI

OCPCLOUD-2998: Add synchronizedAPI to Machine and MachineSet status

Author: openshift-merge-bot[bot]

machine/v1beta1/types_machine.go

@@ -185,6 +185,18 @@ const (
 	MachineAuthorityMigrating MachineAuthority = "Migrating"
 )
 
+// SynchronizedAPI holds the last stable value of authoritativeAPI.
+// +kubebuilder:validation:Enum=MachineAPI;ClusterAPI
+type SynchronizedAPI string
+
+const (
+	// MachineAPISynchronized indicates that the Machine API is the last synchronized API.
+	MachineAPISynchronized SynchronizedAPI = "MachineAPI"
+
+	// ClusterAPISynchronized indicates that the Cluster API is the last synchronized API.
+	ClusterAPISynchronized SynchronizedAPI = "ClusterAPI"
+)
+
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
@@ -407,6 +419,14 @@ type MachineStatus struct {
 	// +optional
 	AuthoritativeAPI MachineAuthority `json:"authoritativeAPI,omitempty"`
 
+	// synchronizedAPI holds the last stable value of authoritativeAPI.
+	// It is used to detect migration cancellation requests and to restore the resource to its previous state.
+	// Valid values are "MachineAPI" and "ClusterAPI".
+	// When omitted, the resource has not yet been reconciled by the migration controller.
+	// +openshift:enable:FeatureGate=MachineAPIMigration
+	// +optional
+	SynchronizedAPI SynchronizedAPI `json:"synchronizedAPI,omitempty"`
+
 	// 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.
 	// +kubebuilder:validation:Minimum=0

machine/v1beta1/types_machineset.go

@@ -169,6 +169,14 @@ type MachineSetStatus struct {
 	// +optional
 	AuthoritativeAPI MachineAuthority `json:"authoritativeAPI,omitempty"`
 
+	// synchronizedAPI holds the last stable value of authoritativeAPI.
+	// It is used to detect migration cancellation requests and to restore the resource to its previous state.
+	// Valid values are "MachineAPI" and "ClusterAPI".
+	// When omitted, the resource has not yet been reconciled by the migration controller.
+	// +openshift:enable:FeatureGate=MachineAPIMigration
+	// +optional
+	SynchronizedAPI SynchronizedAPI `json:"synchronizedAPI,omitempty"`
+
 	// 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.
 	// +kubebuilder:validation:Minimum=0

machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-CustomNoUpgrade.crd.yaml

@@ -567,6 +567,16 @@ spec:
                   serialized/deserialized from this field.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-DevPreviewNoUpgrade.crd.yaml

@@ -567,6 +567,16 @@ spec:
                   serialized/deserialized from this field.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines-TechPreviewNoUpgrade.crd.yaml

@@ -567,6 +567,16 @@ spec:
                   serialized/deserialized from this field.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-CustomNoUpgrade.crd.yaml

@@ -674,6 +674,16 @@ spec:
                 description: replicas is the most recently observed number of replicas.
                 format: int32
                 type: integer
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-DevPreviewNoUpgrade.crd.yaml

@@ -674,6 +674,16 @@ spec:
                 description: replicas is the most recently observed number of replicas.
                 format: int32
                 type: integer
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-TechPreviewNoUpgrade.crd.yaml

@@ -674,6 +674,16 @@ spec:
                 description: replicas is the most recently observed number of replicas.
                 format: int32
                 type: integer
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.featuregated-crd-manifests/machines.machine.openshift.io/MachineAPIMigration.yaml

@@ -569,6 +569,16 @@ spec:
                   serialized/deserialized from this field.
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.

machine/v1beta1/zz_generated.featuregated-crd-manifests/machinesets.machine.openshift.io/MachineAPIMigration.yaml

@@ -676,6 +676,16 @@ spec:
                 description: replicas is the most recently observed number of replicas.
                 format: int32
                 type: integer
+              synchronizedAPI:
+                description: |-
+                  synchronizedAPI holds the last stable value of authoritativeAPI.
+                  It is used to detect migration cancellation requests and to restore the resource to its previous state.
+                  Valid values are "MachineAPI" and "ClusterAPI".
+                  When omitted, the resource has not yet been reconciled by the migration controller.
+                enum:
+                - MachineAPI
+                - ClusterAPI
+                type: string
               synchronizedGeneration:
                 description: |-
                   synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.