Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Aug 2, 2025

When OC_ENABLE_CMD_UPGRADE_RECOMMEND_ACCEPT is not set to true, the --accept option does not exist. In that case, we don't want to error with:

error: issues that apply to this cluster but which were not included in --accept: ConditionalUpdateRisk

Instead, we just want to exit happily, because we've already mentioned the issue earlier in the message.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 2, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 2, 2025

@wking: This pull request references OTA-1600 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

When OC_ENABLE_CMD_UPGRADE_RECOMMEND_ACCEPT is not set to true, the --accept option does not exist. In that case, we don't want to error with:

error: issues that apply to this cluster but which were not included in --accept: ConditionalUpdateRisk

Instead, we just want to exit happily, because we've already mentioned the issue earlier in the message.

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 review from ardaguclu and ingvagabund August 2, 2025 18:28
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 2, 2025
…n the feature gate is off

When OC_ENABLE_CMD_UPGRADE_RECOMMEND_ACCEPT is not set to true, the
--accept option does not exist.  In that case, we don't want to error
with [1]:

  error: issues that apply to this cluster but which were not included in --accept: ConditionalUpdateRisk

Instead, we just want to exit happily, because we've already mentioned
the issue earlier in the message.

[1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/29831/pull-ci-openshift-origin-main-e2e-aws-ovn-serial-1of2/1951653929842380800
@wking wking force-pushed the do-not-error-on-unaccepted-when-feature-gate-is-off branch from 1f897d8 to b74a129 Compare August 3, 2025 15:53
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 3, 2025

@wking: 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-metal-ipi-ovn-ipv6 b74a129 link false /test e2e-metal-ipi-ovn-ipv6
ci/prow/security b74a129 link false /test security
ci/prow/e2e-aws-certrotation b74a129 link false /test e2e-aws-certrotation

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.

@JianLi-RH
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Aug 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 4, 2025

@wking: This pull request references OTA-1600 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set.

Details

In response to this:

When OC_ENABLE_CMD_UPGRADE_RECOMMEND_ACCEPT is not set to true, the --accept option does not exist. In that case, we don't want to error with:

error: issues that apply to this cluster but which were not included in --accept: ConditionalUpdateRisk

Instead, we just want to exit happily, because we've already mentioned the issue earlier in the message.

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.

@JianLi-RH
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 4, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JianLi-RH, wking

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-merge-bot openshift-merge-bot bot merged commit 1073b97 into openshift:main Aug 4, 2025
14 of 17 checks passed
@wking wking deleted the do-not-error-on-unaccepted-when-feature-gate-is-off branch August 4, 2025 04:47
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-cli
This PR has been included in build openshift-enterprise-cli-container-v4.20.0-202508040543.p0.g1073b97.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-tools
This PR has been included in build ose-tools-container-v4.20.0-202508040543.p0.g1073b97.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-deployer
This PR has been included in build openshift-enterprise-deployer-container-v4.20.0-202508040543.p0.g1073b97.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-cli-artifacts
This PR has been included in build ose-cli-artifacts-container-v4.20.0-202508040543.p0.g1073b97.assembly.stream.el9.
All builds following this will include this PR.

wking added a commit to wking/oc that referenced this pull request Sep 3, 2025
To make that functionality generally available.  This could be a more
thorough overhaul, e.g. I could drop the precheckEnabled knob
entirely.  But I'm doing the smallest possible pivot now, in case
folks want to backport to older 4.y.  And I can do the dev-branch
polishing later on.

The:

  error: issues that apply to this cluster but which were not included in --accept: AlertNoTestData,ConditionalUpdateRisk

output that b74a129 (pkg/cli/admin/upgrade/recommend: Don't error
on unaccepted issues when the feature gate is off, 2025-08-02, openshift#2069)
had removed from the test fixtures is back, now that the accept gate
is enabled by default (and thus newly enabled for the test suite).
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/oc that referenced this pull request Sep 15, 2025
To make that functionality generally available.  This could be a more
thorough overhaul, e.g. I could drop the precheckEnabled knob
entirely.  But I'm doing the smallest possible pivot now, in case
folks want to backport to older 4.y.  And I can do the dev-branch
polishing later on.

The:

  error: issues that apply to this cluster but which were not included in --accept: AlertNoTestData,ConditionalUpdateRisk

output that b74a129 (pkg/cli/admin/upgrade/recommend: Don't error
on unaccepted issues when the feature gate is off, 2025-08-02, openshift#2069)
had removed from the test fixtures is back, now that the accept gate
is enabled by default (and thus newly enabled for the test suite).
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-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants