Skip to content

[OTA-1545] Extend ClusterVersion for accepted risks #2360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[OTA-1545] Extend ClusterVersion for accepted risks #2360

wants to merge 3 commits into from

Conversation

hongkailiu
Copy link
Member

@hongkailiu hongkailiu commented Jun 9, 2025 •
edited
Loading

The API extensions is proposed in openshift/enhancements#1807

  • Add a new field clusterversion.spec.desiredUpdate.acceptRisks: It
    containsthe names of conditional update risks that are considered
    acceptable.
  • Move clusterversion.status.conditionalUpdates.risks two levels up as
    clusterversion.status.conditionalUpdateRisks. It contains all the risks
    for clusterversion.status.conditionalUpdates.
  • Add new field 'clusterversion.status.conditionalUpdates.riskNames': It
    contains the names of risk for the conditional update. It deprecates
    clusterversion.status.conditionalUpdates.risks.
  • Add a new field 'clusterversion.status.conditionalUpdateRisks.conditions':
    It contains the observations of the conditional update risk's current
    status.

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jun 9, 2025

Hello @hongkailiu! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 9, 2025
@hongkailiu hongkailiu changed the title [OTA-1545] Extend ClusterVersion for accepted risks [wip][OTA-1545] Extend ClusterVersion for accepted risks Jun 9, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 9, 2025
@openshift-ci openshift-ci bot requested review from deads2k and everettraven June 9, 2025 21:08
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 10, 2025
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 10, 2025
@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 10, 2025
@hongkailiu hongkailiu force-pushed the OTA-1545 branch 2 times, most recently from 6dc1e06 to e780c3a Compare June 10, 2025 16:12
@openshift-ci openshift-ci bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 10, 2025
@hongkailiu hongkailiu force-pushed the OTA-1545 branch 4 times, most recently from 5218865 to 4b05550 Compare June 10, 2025 22:49
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 10, 2025
@hongkailiu hongkailiu mentioned this pull request Jun 10, 2025
Open
@hongkailiu hongkailiu force-pushed the OTA-1545 branch 4 times, most recently from f03a0de to 73dc822 Compare June 11, 2025 14:17
@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 Jul 31, 2025
@JoelSpeed
Copy link
Contributor

/approve cancel

I think there's still some open discussion in the EP that we need to resolve before we merge this

openshift/enhancements#1807 (comment)

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 1, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 1, 2025

New changes are detected. LGTM label has been removed.

@hongkailiu
Copy link
Member Author

/retest-required

1 similar comment
@hongkailiu
Copy link
Member Author

/retest-required

@hongkailiu
Copy link
Member Author

/test e2e-aws-ovn-techpreview

@hongkailiu
Copy link
Member Author

I think there's still some open discussion in the EP that we need to resolve before we merge this

Addressed in the most recent patch. PTAL.

@hongkailiu
Copy link
Member Author

/retest

@hongkailiu
Copy link
Member Author

/test e2e-aws-ovn-techpreview

@JoelSpeed
Copy link
Contributor

@hongkailiu Please stop retesting

The test suite is currently permafailing and this PR is not yet approved, there's no point retesting as other things will merge before this, and the suite will need to be tested again once the master branch has moved

@JoelSpeed
Copy link
Contributor

I believe @petr-muller's concerns from the EP have been convered here, but I'd like his confirmation
/assign @petr-muller

@hongkailiu
Copy link
Member Author

@JoelSpeed
Thanks for the feedback on the pulls, here and the EP.

Petr is PTO until the end week of this week.
I am OK with waiting because I held it for the branching anyway.

hongkailiu
hongkailiu commented Aug 6, 2025
View reviewed changes
@hongkailiu hongkailiu force-pushed the OTA-1545 branch 2 times, most recently from 7961806 to a240545 Compare August 13, 2025 11:26
JoelSpeed
JoelSpeed reviewed Aug 13, 2025
View reviewed changes
@hongkailiu
[OTA-1545] Extend ClusterVersion for accepted risks
b2dc574 
- Add a new field 'clusterversion.spec.desiredUpdate.acceptRisks': It
  containsthe names of conditional update risks that are considered
  acceptable.
- Move `clusterversion.status.conditionalUpdates.risks` two levels up as
  `clusterversion.status.conditionalUpdateRisks`. It contains all the risks
  for `clusterversion.status.conditionalUpdates`.
- Add new field 'clusterversion.status.conditionalUpdates.riskNames': It
  contains the names of risk for the conditional update. It deprecates
  `clusterversion.status.conditionalUpdates.risks`.
- Add a new field 'clusterversion.status.conditionalUpdateRisks.conditions':
  It contains the observations of the conditional update risk's current
  status.
@hongkailiu
Remove the docs changes on the existing fields
2c8523b 
The changes introduced by this pull are currently gated by
a feature and there is not yet a mechanism to determine for existing
fields which parts of docs should be included in which enabled
features.

We may revert this commit when the feature is promoted.
@hongkailiu
make update
0d84d57
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 13, 2025

@hongkailiu: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-serial-techpreview-2of2 0d84d57 link true /test e2e-aws-serial-techpreview-2of2
ci/prow/okd-scos-e2e-aws-ovn 0d84d57 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-aws-ovn 0d84d57 link true /test e2e-aws-ovn
ci/prow/e2e-azure 0d84d57 link false /test e2e-azure

Full PR test history. Your PR dashboard.

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.

@JoelSpeed
Copy link
Contributor

@petr-muller @wking Are you both happy with the shape of this API and the behaviour per the test cases? Are we confident enough in the progress of the EP to say this is ready to merge?

@petr-muller
Copy link
Member

I was in a crunch to deliver something for 4.20 so I haven't had time to look but with that out of the way I plan to skim the enhancement today or tomorrow.

@petr-muller
Copy link
Member

Re-reviewed both the enhancement and the API today, I am fine with the current state (and really appreciate the effort that went to it 💚)

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 15, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: everettraven, hongkailiu, petr-muller
Once this PR has been reviewed and has the lgtm label, please ask for approval from joelspeed. For more information see the Code Review Process.

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

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

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

@deads2k deads2k Awaiting requested review from deads2k

4 more reviewers

@wking wking wking left review comments

@JoelSpeed JoelSpeed JoelSpeed left review comments

@petr-muller petr-muller petr-muller approved these changes

@everettraven everettraven everettraven approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@petr-muller petr-muller

@JoelSpeed JoelSpeed

@everettraven everettraven

Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@hongkailiu @petr-muller @JoelSpeed @everettraven @openshift-ci-robot @wking @openshift-merge-robot