Skip to content

Commit 14cdccc

Browse files
damdodamdo
committed
resync crds
1 parent 22d0206 commit 14cdccc

4 files changed

+216
-0
lines changed

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

+47
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,20 @@ spec:
8181
spec:
8282
description: MachineSpec defines the desired state of Machine
8383
properties:
84+
authoritativeAPI:
85+
default: MachineAPI
86+
description: |-
87+
authoritativeAPI is the API that is authoritative for this resource.
88+
Valid values are MachineAPI and ClusterAPI.
89+
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.
90+
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.
91+
Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
92+
Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
93+
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`.
94+
enum:
95+
- MachineAPI
96+
- ClusterAPI
97+
type: string
8498
lifecycleHooks:
8599
description: |-
86100
lifecycleHooks allow users to pause operations on the machine at
@@ -364,6 +378,23 @@ spec:
364378
type: object
365379
type: array
366380
x-kubernetes-list-type: atomic
381+
authoritativeAPI:
382+
description: |-
383+
authoritativeAPI is the API that is authoritative for this resource.
384+
Valid values are MachineAPI, ClusterAPI and Migrating.
385+
This value is updated by the migration controller to reflect the authoritative API.
386+
Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
387+
When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
388+
enum:
389+
- MachineAPI
390+
- ClusterAPI
391+
- Migrating
392+
type: string
393+
x-kubernetes-validations:
394+
- message: The authoritativeAPI field must not transition directly
395+
from MachineAPI to ClusterAPI or vice versa. It must transition
396+
through Migrating.
397+
rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
367398
conditions:
368399
description: conditions defines the current state of the Machine
369400
items:
@@ -537,7 +568,23 @@ spec:
537568
serialized/deserialized from this field.
538569
type: object
539570
x-kubernetes-preserve-unknown-fields: true
571+
synchronizedGeneration:
572+
description: |-
573+
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
574+
This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
575+
format: int64
576+
minimum: 0
577+
type: integer
540578
type: object
579+
x-kubernetes-validations:
580+
- fieldPath: .synchronizedGeneration
581+
message: synchronizedGeneration must not decrease unless authoritativeAPI
582+
is transitioning from Migrating to another value
583+
reason: FieldValueInvalid
584+
rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
585+
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
586+
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
587+
!= ''Migrating'')'
541588
type: object
542589
served: true
543590
storage: true

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

+47
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,20 @@ spec:
8181
spec:
8282
description: MachineSpec defines the desired state of Machine
8383
properties:
84+
authoritativeAPI:
85+
default: MachineAPI
86+
description: |-
87+
authoritativeAPI is the API that is authoritative for this resource.
88+
Valid values are MachineAPI and ClusterAPI.
89+
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.
90+
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.
91+
Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
92+
Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
93+
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`.
94+
enum:
95+
- MachineAPI
96+
- ClusterAPI
97+
type: string
8498
lifecycleHooks:
8599
description: |-
86100
lifecycleHooks allow users to pause operations on the machine at
@@ -364,6 +378,23 @@ spec:
364378
type: object
365379
type: array
366380
x-kubernetes-list-type: atomic
381+
authoritativeAPI:
382+
description: |-
383+
authoritativeAPI is the API that is authoritative for this resource.
384+
Valid values are MachineAPI, ClusterAPI and Migrating.
385+
This value is updated by the migration controller to reflect the authoritative API.
386+
Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
387+
When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
388+
enum:
389+
- MachineAPI
390+
- ClusterAPI
391+
- Migrating
392+
type: string
393+
x-kubernetes-validations:
394+
- message: The authoritativeAPI field must not transition directly
395+
from MachineAPI to ClusterAPI or vice versa. It must transition
396+
through Migrating.
397+
rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
367398
conditions:
368399
description: conditions defines the current state of the Machine
369400
items:
@@ -537,7 +568,23 @@ spec:
537568
serialized/deserialized from this field.
538569
type: object
539570
x-kubernetes-preserve-unknown-fields: true
571+
synchronizedGeneration:
572+
description: |-
573+
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
574+
This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
575+
format: int64
576+
minimum: 0
577+
type: integer
540578
type: object
579+
x-kubernetes-validations:
580+
- fieldPath: .synchronizedGeneration
581+
message: synchronizedGeneration must not decrease unless authoritativeAPI
582+
is transitioning from Migrating to another value
583+
reason: FieldValueInvalid
584+
rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
585+
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
586+
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
587+
!= ''Migrating'')'
541588
type: object
542589
served: true
543590
storage: true

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

+61
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ spec:
6666
spec:
6767
description: MachineSetSpec defines the desired state of MachineSet
6868
properties:
69+
authoritativeAPI:
70+
default: MachineAPI
71+
description: |-
72+
authoritativeAPI is the API that is authoritative for this resource.
73+
Valid values are MachineAPI and ClusterAPI.
74+
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.
75+
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.
76+
Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
77+
Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
78+
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`.
79+
enum:
80+
- MachineAPI
81+
- ClusterAPI
82+
type: string
6983
deletePolicy:
7084
description: |-
7185
deletePolicy defines the policy used to identify nodes to delete when downscaling.
@@ -267,6 +281,20 @@ spec:
267281
Specification of the desired behavior of the machine.
268282
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
269283
properties:
284+
authoritativeAPI:
285+
default: MachineAPI
286+
description: |-
287+
authoritativeAPI is the API that is authoritative for this resource.
288+
Valid values are MachineAPI and ClusterAPI.
289+
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.
290+
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.
291+
Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
292+
Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
293+
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`.
294+
enum:
295+
- MachineAPI
296+
- ClusterAPI
297+
type: string
270298
lifecycleHooks:
271299
description: |-
272300
lifecycleHooks allow users to pause operations on the machine at
@@ -535,6 +563,23 @@ spec:
535563
status:
536564
description: MachineSetStatus defines the observed state of MachineSet
537565
properties:
566+
authoritativeAPI:
567+
description: |-
568+
authoritativeAPI is the API that is authoritative for this resource.
569+
Valid values are MachineAPI, ClusterAPI and Migrating.
570+
This value is updated by the migration controller to reflect the authoritative API.
571+
Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
572+
When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
573+
enum:
574+
- MachineAPI
575+
- ClusterAPI
576+
- Migrating
577+
type: string
578+
x-kubernetes-validations:
579+
- message: The authoritativeAPI field must not transition directly
580+
from MachineAPI to ClusterAPI or vice versa. It must transition
581+
through Migrating.
582+
rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
538583
availableReplicas:
539584
description: The number of available replicas (ready for at least
540585
minReadySeconds) for this MachineSet.
@@ -630,7 +675,23 @@ spec:
630675
description: replicas is the most recently observed number of replicas.
631676
format: int32
632677
type: integer
678+
synchronizedGeneration:
679+
description: |-
680+
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
681+
This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
682+
format: int64
683+
minimum: 0
684+
type: integer
633685
type: object
686+
x-kubernetes-validations:
687+
- fieldPath: .synchronizedGeneration
688+
message: synchronizedGeneration must not decrease unless authoritativeAPI
689+
is transitioning from Migrating to another value
690+
reason: FieldValueInvalid
691+
rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
692+
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
693+
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
694+
!= ''Migrating'')'
634695
type: object
635696
served: true
636697
storage: true

‎install/0000_30_machine-api-operator_03_machineset.TechPreviewNoUpgrade.crd.yaml

+61
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ spec:
6666
spec:
6767
description: MachineSetSpec defines the desired state of MachineSet
6868
properties:
69+
authoritativeAPI:
70+
default: MachineAPI
71+
description: |-
72+
authoritativeAPI is the API that is authoritative for this resource.
73+
Valid values are MachineAPI and ClusterAPI.
74+
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.
75+
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.
76+
Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
77+
Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
78+
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`.
79+
enum:
80+
- MachineAPI
81+
- ClusterAPI
82+
type: string
6983
deletePolicy:
7084
description: |-
7185
deletePolicy defines the policy used to identify nodes to delete when downscaling.
@@ -267,6 +281,20 @@ spec:
267281
Specification of the desired behavior of the machine.
268282
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
269283
properties:
284+
authoritativeAPI:
285+
default: MachineAPI
286+
description: |-
287+
authoritativeAPI is the API that is authoritative for this resource.
288+
Valid values are MachineAPI and ClusterAPI.
289+
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.
290+
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.
291+
Updates to the status will be reflected in both copies of the resource, based on the controller implementing the functionality of the API.
292+
Currently the authoritative API determines which controller will manage the resource, this will change in a future release.
293+
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`.
294+
enum:
295+
- MachineAPI
296+
- ClusterAPI
297+
type: string
270298
lifecycleHooks:
271299
description: |-
272300
lifecycleHooks allow users to pause operations on the machine at
@@ -535,6 +563,23 @@ spec:
535563
status:
536564
description: MachineSetStatus defines the observed state of MachineSet
537565
properties:
566+
authoritativeAPI:
567+
description: |-
568+
authoritativeAPI is the API that is authoritative for this resource.
569+
Valid values are MachineAPI, ClusterAPI and Migrating.
570+
This value is updated by the migration controller to reflect the authoritative API.
571+
Machine API and Cluster API controllers use this value to determine whether or not to reconcile the resource.
572+
When set to Migrating, the migration controller is currently performing the handover of authority from one API to the other.
573+
enum:
574+
- MachineAPI
575+
- ClusterAPI
576+
- Migrating
577+
type: string
578+
x-kubernetes-validations:
579+
- message: The authoritativeAPI field must not transition directly
580+
from MachineAPI to ClusterAPI or vice versa. It must transition
581+
through Migrating.
582+
rule: self == 'Migrating' || self == oldSelf || oldSelf == 'Migrating'
538583
availableReplicas:
539584
description: The number of available replicas (ready for at least
540585
minReadySeconds) for this MachineSet.
@@ -630,7 +675,23 @@ spec:
630675
description: replicas is the most recently observed number of replicas.
631676
format: int32
632677
type: integer
678+
synchronizedGeneration:
679+
description: |-
680+
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
681+
This field is set when the authoritative resource is updated and the sync controller has updated the non-authoritative resource to match.
682+
format: int64
683+
minimum: 0
684+
type: integer
633685
type: object
686+
x-kubernetes-validations:
687+
- fieldPath: .synchronizedGeneration
688+
message: synchronizedGeneration must not decrease unless authoritativeAPI
689+
is transitioning from Migrating to another value
690+
reason: FieldValueInvalid
691+
rule: '!has(oldSelf.synchronizedGeneration) || (has(self.synchronizedGeneration)
692+
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
693+
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
694+
!= ''Migrating'')'
634695
type: object
635696
served: true
636697
storage: true

0 commit comments

Comments
 (0)