Skip to content

Commit 4068811

Browse files
committed
DNM: vendor SynchronizedAPI
1 parent 4610a83 commit 4068811

22 files changed

Lines changed: 164 additions & 47 deletions

go.mod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ replace (
1111
k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20251027205255-4e0347881cbd
1212
)
1313

14+
replace (
15+
github.com/openshift/api => ../api
16+
github.com/openshift/clinet-go => ../client-go
17+
)
18+
1419
require (
1520
github.com/blang/semver v3.5.1+incompatible
1621
github.com/go-logr/logr v1.4.3

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,6 @@ github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jD
449449
github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
450450
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251105193959-75a0be5d9bd7 h1:Z1swlS6b3Adm6RPhjqefs3DWnNFLDxRX+WC8GMXhja4=
451451
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251105193959-75a0be5d9bd7/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
452-
github.com/openshift/api v0.0.0-20260114133223-6ab113cb7368 h1:kSr3DOlq0NCrHd65HB2o/pBsks7AfRm+fkpf9RLUPoc=
453-
github.com/openshift/api v0.0.0-20260114133223-6ab113cb7368/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
454452
github.com/openshift/client-go v0.0.0-20251202151200-fb4471581cf8 h1:97rgISdT4IOmXlmEUV5Wr6d8BzzjPclzAjCARLbSlT0=
455453
github.com/openshift/client-go v0.0.0-20251202151200-fb4471581cf8/go.mod h1:WVJnsrbSO1J8x8KceOmv1d5CpoN34Uzsaz1O4MIOKJI=
456454
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250910145856-21d03d30056d h1:+sqUThLi/lmgT5/scmmjnS6+RZFtbdxRAscNfCPyLPI=

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,16 @@ spec:
567567
serialized/deserialized from this field.
568568
type: object
569569
x-kubernetes-preserve-unknown-fields: true
570+
synchronizedAPI:
571+
description: |-
572+
synchronizedAPI holds the last stable value of authoritativeAPI.
573+
It is used to detect migration cancellation requests and to restore the resource to its previous state.
574+
Valid values are "MachineAPI" and "ClusterAPI".
575+
When omitted, the resource has not yet been reconciled by the migration controller.
576+
enum:
577+
- MachineAPI
578+
- ClusterAPI
579+
type: string
570580
synchronizedGeneration:
571581
description: |-
572582
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
@@ -584,8 +594,6 @@ spec:
584594
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
585595
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
586596
!= ''Migrating'')'
587-
- message: authoritativeAPI may not be removed once set
588-
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
589597
type: object
590598
served: true
591599
storage: true

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,16 @@ spec:
567567
serialized/deserialized from this field.
568568
type: object
569569
x-kubernetes-preserve-unknown-fields: true
570+
synchronizedAPI:
571+
description: |-
572+
synchronizedAPI holds the last stable value of authoritativeAPI.
573+
It is used to detect migration cancellation requests and to restore the resource to its previous state.
574+
Valid values are "MachineAPI" and "ClusterAPI".
575+
When omitted, the resource has not yet been reconciled by the migration controller.
576+
enum:
577+
- MachineAPI
578+
- ClusterAPI
579+
type: string
570580
synchronizedGeneration:
571581
description: |-
572582
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
@@ -584,8 +594,6 @@ spec:
584594
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
585595
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
586596
!= ''Migrating'')'
587-
- message: authoritativeAPI may not be removed once set
588-
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
589597
type: object
590598
served: true
591599
storage: true

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,16 @@ spec:
567567
serialized/deserialized from this field.
568568
type: object
569569
x-kubernetes-preserve-unknown-fields: true
570+
synchronizedAPI:
571+
description: |-
572+
synchronizedAPI holds the last stable value of authoritativeAPI.
573+
It is used to detect migration cancellation requests and to restore the resource to its previous state.
574+
Valid values are "MachineAPI" and "ClusterAPI".
575+
When omitted, the resource has not yet been reconciled by the migration controller.
576+
enum:
577+
- MachineAPI
578+
- ClusterAPI
579+
type: string
570580
synchronizedGeneration:
571581
description: |-
572582
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
@@ -584,8 +594,6 @@ spec:
584594
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
585595
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
586596
!= ''Migrating'')'
587-
- message: authoritativeAPI may not be removed once set
588-
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
589597
type: object
590598
served: true
591599
storage: true

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,16 @@ spec:
674674
description: replicas is the most recently observed number of replicas.
675675
format: int32
676676
type: integer
677+
synchronizedAPI:
678+
description: |-
679+
synchronizedAPI holds the last stable value of authoritativeAPI.
680+
It is used to detect migration cancellation requests and to restore the resource to its previous state.
681+
Valid values are "MachineAPI" and "ClusterAPI".
682+
When omitted, the resource has not yet been reconciled by the migration controller.
683+
enum:
684+
- MachineAPI
685+
- ClusterAPI
686+
type: string
677687
synchronizedGeneration:
678688
description: |-
679689
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
@@ -691,8 +701,6 @@ spec:
691701
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
692702
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
693703
!= ''Migrating'')'
694-
- message: authoritativeAPI may not be removed once set
695-
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
696704
type: object
697705
served: true
698706
storage: true

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,16 @@ spec:
674674
description: replicas is the most recently observed number of replicas.
675675
format: int32
676676
type: integer
677+
synchronizedAPI:
678+
description: |-
679+
synchronizedAPI holds the last stable value of authoritativeAPI.
680+
It is used to detect migration cancellation requests and to restore the resource to its previous state.
681+
Valid values are "MachineAPI" and "ClusterAPI".
682+
When omitted, the resource has not yet been reconciled by the migration controller.
683+
enum:
684+
- MachineAPI
685+
- ClusterAPI
686+
type: string
677687
synchronizedGeneration:
678688
description: |-
679689
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
@@ -691,8 +701,6 @@ spec:
691701
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
692702
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
693703
!= ''Migrating'')'
694-
- message: authoritativeAPI may not be removed once set
695-
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
696704
type: object
697705
served: true
698706
storage: true

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,16 @@ spec:
674674
description: replicas is the most recently observed number of replicas.
675675
format: int32
676676
type: integer
677+
synchronizedAPI:
678+
description: |-
679+
synchronizedAPI holds the last stable value of authoritativeAPI.
680+
It is used to detect migration cancellation requests and to restore the resource to its previous state.
681+
Valid values are "MachineAPI" and "ClusterAPI".
682+
When omitted, the resource has not yet been reconciled by the migration controller.
683+
enum:
684+
- MachineAPI
685+
- ClusterAPI
686+
type: string
677687
synchronizedGeneration:
678688
description: |-
679689
synchronizedGeneration is the generation of the authoritative resource that the non-authoritative resource is synchronised with.
@@ -691,8 +701,6 @@ spec:
691701
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
692702
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
693703
!= ''Migrating'')'
694-
- message: authoritativeAPI may not be removed once set
695-
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
696704
type: object
697705
served: true
698706
storage: true

vendor/github.com/openshift/api/features.md

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/features/features.go

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)