Skip to content

Commit 4610a83

Browse files
Merge pull request #1453 from damdo/bump-api-20260115
OCPCLOUD-3166: Bump openshift/api
2 parents 6337d58 + 1298c94 commit 4610a83

69 files changed

Lines changed: 7743 additions & 873 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/onsi/ginkgo/v2 v2.27.2
2020
github.com/onsi/gomega v1.38.2
2121
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251105193959-75a0be5d9bd7
22-
github.com/openshift/api v0.0.0-20251214014457-bfa868a22401
22+
github.com/openshift/api v0.0.0-20260114133223-6ab113cb7368
2323
github.com/openshift/client-go v0.0.0-20251202151200-fb4471581cf8
2424
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20250910145856-21d03d30056d
2525
github.com/openshift/cluster-control-plane-machine-set-operator v0.0.0-20251029084908-344babe6a957

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ 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-20251214014457-bfa868a22401 h1:goMf6pBtRFSQaVElFk6K+GIAqnv7O84p7PJHH6pDz/E=
453-
github.com/openshift/api v0.0.0-20251214014457-bfa868a22401/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
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=
454454
github.com/openshift/client-go v0.0.0-20251202151200-fb4471581cf8 h1:97rgISdT4IOmXlmEUV5Wr6d8BzzjPclzAjCARLbSlT0=
455455
github.com/openshift/client-go v0.0.0-20251202151200-fb4471581cf8/go.mod h1:WVJnsrbSO1J8x8KceOmv1d5CpoN34Uzsaz1O4MIOKJI=
456456
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,8 @@ spec:
584584
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
585585
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
586586
!= ''Migrating'')'
587+
- message: authoritativeAPI may not be removed once set
588+
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
587589
type: object
588590
served: true
589591
storage: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,8 @@ spec:
584584
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
585585
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
586586
!= ''Migrating'')'
587+
- message: authoritativeAPI may not be removed once set
588+
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
587589
type: object
588590
served: true
589591
storage: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,8 @@ spec:
584584
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
585585
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
586586
!= ''Migrating'')'
587+
- message: authoritativeAPI may not be removed once set
588+
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
587589
type: object
588590
served: true
589591
storage: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ spec:
691691
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
692692
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
693693
!= ''Migrating'')'
694+
- message: authoritativeAPI may not be removed once set
695+
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
694696
type: object
695697
served: true
696698
storage: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ spec:
691691
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
692692
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
693693
!= ''Migrating'')'
694+
- message: authoritativeAPI may not be removed once set
695+
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
694696
type: object
695697
served: true
696698
storage: true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ spec:
691691
&& self.synchronizedGeneration >= oldSelf.synchronizedGeneration)
692692
|| (oldSelf.authoritativeAPI == ''Migrating'' && self.authoritativeAPI
693693
!= ''Migrating'')'
694+
- message: authoritativeAPI may not be removed once set
695+
rule: has(self.authoritativeAPI) || !has(oldSelf.authoritativeAPI)
694696
type: object
695697
served: true
696698
storage: true

vendor/github.com/openshift/api/.ci-operator.yaml

Lines changed: 1 addition & 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/.coderabbit.yaml

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

0 commit comments

Comments
 (0)