Skip to content

Conversation

@damdo
Copy link
Member

@damdo damdo commented Jan 26, 2026

Pin IPAM CRDs to use v1beta1 as the storage version.

Upstream CAPI did set v1beta2 as storage version immediately after it was added,
but according to our downstream policy, a new APIVersion cannot be set as storage version
in the same release it gets added. As this would hinder the ability to roll it back in case of an issue.
As such we need to pin the storage version to v1beta1 for at least the first release we GA cluster-api.
After that, we can bump the storage version to v1beta2, and run the storage version migration.

damdo added 2 commits January 26, 2026 18:44
…: storage:false

Pin IPAM CRDs to use v1beta1 as the storage version.
Upstream CAPI did set v1beta2 as storage version immediately after it was added,
but according to our downstream policy, a new APIVersion cannot be set as storage version
in the same release it gets added. As this would hinder the ability to roll it back in case of an issue.
As such we need to pin the storage version to v1beta1 for at least the first release we GA cluster-api.
After that, we can bump the storage version to v1beta2, and run the storage version migration.
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jan 26, 2026
@openshift-ci-robot
Copy link

@damdo: This pull request references Jira Issue OCPBUGS-74426, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Pin IPAM CRDs to use v1beta1 as the storage version.

Upstream CAPI did set v1beta2 as storage version immediately after it was added,
but according to our downstream policy, a new APIVersion cannot be set as storage version
in the same release it gets added. As this would hinder the ability to roll it back in case of an issue.
As such we need to pin the storage version to v1beta1 for at least the first release we GA cluster-api.
After that, we can bump the storage version to v1beta2, and run the storage version migration.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from sunzhaohua2 January 26, 2026 17:46
@damdo
Copy link
Member Author

damdo commented Jan 26, 2026

/assign @JoelSpeed @mdbooth

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 26, 2026
@damdo
Copy link
Member Author

damdo commented Jan 26, 2026

/hold

For testing

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 26, 2026
@damdo damdo changed the title OCPBUGS-74426: CAPI IPAM CRDs set storage version to v1beta1 OCPBUGS-74426: CAPI IPAM CRDs override storage version to v1beta1 Jan 26, 2026
Copy link

@mdbooth mdbooth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2026
@openshift-ci
Copy link

openshift-ci bot commented Jan 26, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, mdbooth

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link

openshift-ci bot commented Jan 26, 2026

@damdo: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@sunzhaohua2
Copy link

/verified by @sunzhaohua2

$ oc get crd ipaddresses.ipam.cluster.x-k8s.io -o jsonpath='{.spec.versions[?(@.storage==true)].name}'   
v1beta1%
$ oc get crd ipaddressclaims.ipam.cluster.x-k8s.io -o jsonpath='{.spec.versions[?(@.storage==true)].name}'  
v1beta1%

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 27, 2026
@openshift-ci-robot
Copy link

@sunzhaohua2: This PR has been marked as verified by @sunzhaohua2.

Details

In response to this:

/verified by @sunzhaohua2

$ oc get crd ipaddresses.ipam.cluster.x-k8s.io -o jsonpath='{.spec.versions[?(@.storage==true)].name}'   
v1beta1%
$ oc get crd ipaddressclaims.ipam.cluster.x-k8s.io -o jsonpath='{.spec.versions[?(@.storage==true)].name}'  
v1beta1%

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@damdo
Copy link
Member Author

damdo commented Jan 27, 2026

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 27, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit 3583379 into openshift:master Jan 27, 2026
19 checks passed
@openshift-ci-robot
Copy link

@damdo: Jira Issue Verification Checks: Jira Issue OCPBUGS-74426
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-74426 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Pin IPAM CRDs to use v1beta1 as the storage version.

Upstream CAPI did set v1beta2 as storage version immediately after it was added,
but according to our downstream policy, a new APIVersion cannot be set as storage version
in the same release it gets added. As this would hinder the ability to roll it back in case of an issue.
As such we need to pin the storage version to v1beta1 for at least the first release we GA cluster-api.
After that, we can bump the storage version to v1beta2, and run the storage version migration.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants