TRT-2817: Revert "Merge pull request #2279 from nbottari9/1814-duplicate-warning" by redhat-chai-bot · Pull Request #2320 · openshift/oc

redhat-chai-bot · 2026-07-22T16:39:20Z

Revert of #2279

This reverts commit 54b7c12, reversing changes made to ae0477d.

Why

PR #2279 introduced a regression that is blocking the 5.0 nightly payload (5.0.0-0.nightly-2026-07-22-072716):

alertsEvaluatedByCVO() returns nil from alerts() when the ClusterUpdateAcceptRisks feature gate is enabled (TechPreview-only), removing the preamble line that tests expect from oc adm upgrade recommend output
Failing jobs: aws-ovn-techpreview-serial-1of3, aws-ovn-techpreview-serial-2of3 (both retries failed identically)
Root cause confidence: 100%

Details

Tracking: TRT-2817
A potential forward-fix (oc#2319) is open from the same author — the author should address the nil-handling issues before re-merging

/override ci/prow/e2e-agnostic-ovn-cmd
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-serial
/override ci/prow/e2e-aws-ovn-upgrade
/override ci/prow/e2e-aws-ovn-single-node
/override ci/prow/e2e-aws-ovn-crun

@petr-muller requested in Slack thread

Summary by CodeRabbit

Bug Fixes
- Upgrade recommendations now consistently evaluate cluster alerts before reporting risks and conditions.
- Unaccepted upgrade issues now produce a consistent error message.
Tests
- Updated example-based tests and fixtures to reflect the revised alert evaluation behavior.
Chores
- Removed outdated upgrade recommendation examples and test data no longer required.

…14-duplicate-warning" This reverts commit 54b7c12, reversing changes made to ae0477d. PR openshift#2279 introduced a regression: alertsEvaluatedByCVO() returns nil from alerts() when the ClusterUpdateAcceptRisks feature gate (TechPreview-only) is enabled, breaking `oc adm upgrade recommend` output. This is blocking the 5.0 nightly payload.

openshift-merge-bot · 2026-07-22T16:39:23Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

openshift-ci-robot · 2026-07-22T16:39:25Z

@redhat-chai-bot: This pull request references TRT-2817 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 bug to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Revert of #2279

This reverts commit 54b7c12, reversing changes made to ae0477d.

Why

PR #2279 introduced a regression that is blocking the 5.0 nightly payload (5.0.0-0.nightly-2026-07-22-072716):

alertsEvaluatedByCVO() returns nil from alerts() when the ClusterUpdateAcceptRisks feature gate is enabled (TechPreview-only), removing the preamble line that tests expect from oc adm upgrade recommend output

Failing jobs: aws-ovn-techpreview-serial-1of3, aws-ovn-techpreview-serial-2of3 (both retries failed identically)

Root cause confidence: 100%

Details

Tracking: TRT-2817

A potential forward-fix (oc#2319) is open from the same author — the author should address the nil-handling issues before re-merging

/override ci/prow/e2e-agnostic-ovn-cmd
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-serial
/override ci/prow/e2e-aws-ovn-upgrade
/override ci/prow/e2e-aws-ovn-single-node
/override ci/prow/e2e-aws-ovn-crun

@petr-muller requested in Slack thread

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.

coderabbitai · 2026-07-22T16:40:02Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: bcee9105-3f33-4ab7-90a9-99bd7524f56f

📥 Commits

Reviewing files that changed from the base of the PR and between cd086f9 and b57298a.

📒 Files selected for processing (19)

pkg/cli/admin/upgrade/recommend/alerts.go
pkg/cli/admin/upgrade/recommend/alerts_test.go
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-alerts.json
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-cv.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-featuregate.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-infrastructure.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks.output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks.show-outdated-releases-output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks.version-5.0.0-ec.3-output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-alerts.json
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-cv.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-featuregate.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-infrastructure.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks.output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks.show-outdated-releases-output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks.version-5.0.0-ec.3-output
pkg/cli/admin/upgrade/recommend/examples_test.go
pkg/cli/admin/upgrade/recommend/mockresources.go
pkg/cli/admin/upgrade/recommend/recommend.go

💤 Files with no reviewable changes (17)

pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks.version-5.0.0-ec.3-output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks.show-outdated-releases-output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks.output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-cv.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks.output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-infrastructure.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-alerts.json
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-infrastructure.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks-featuregate.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks.show-outdated-releases-output
pkg/cli/admin/upgrade/recommend/alerts_test.go
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-cv.yaml
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-alerts.json
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-not-handling-risks.version-5.0.0-ec.3-output
pkg/cli/admin/upgrade/recommend/examples/5.0.0-cvo-handling-risks-featuregate.yaml
pkg/cli/admin/upgrade/recommend/alerts.go
pkg/cli/admin/upgrade/recommend/examples_test.go

Walkthrough

The upgrade recommendation flow no longer skips client-side alert evaluation based on CVO handling. Mock data loading now excludes feature-gate and infrastructure resources, related fixture expectations are removed, and unaccepted issues use one generic error path.

Changes

Upgrade alert evaluation

Layer / File(s)	Summary
Alert evaluation and issue reporting `pkg/cli/admin/upgrade/recommend/alerts.go`, `pkg/cli/admin/upgrade/recommend/recommend.go`	CVO-based alert skip logic and helper imports are removed, while unaccepted issues always produce the generic error message.
Mock resource loading `pkg/cli/admin/upgrade/recommend/mockresources.go`, `pkg/cli/admin/upgrade/recommend/recommend.go`	Mock data retains ClusterVersion and optional alerts, and setup no longer derives feature-gate or infrastructure fixtures.
Fixture expectation cleanup `pkg/cli/admin/upgrade/recommend/examples_test.go`, `pkg/cli/admin/upgrade/recommend/examples/*`	CVO risk fixture version overrides and associated example contents are removed.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

openshift/oc#2279: Adds the CVO/client-side alert-skipping behavior removed by this PR.
openshift/oc#2319: Adds CVO-sourced risk handling at the same alert evaluation path.

Suggested reviewers: nbottari9

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly identifies this as a revert of the prior pull request and matches the changeset's intent.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names	✅ Passed	No Ginkgo titles were added or changed; the only surviving test file uses static t.Run names, and alerts_test.go was deleted.
Test Structure And Quality	✅ Passed	No Ginkgo tests were added or changed; the only touched test is a standard table-driven Go test, and the deleted alerts tests weren’t Ginkgo.
Microshift Test Compatibility	✅ Passed	No new Ginkgo e2e tests were added; the PR only removes a test file/fixtures and changes production code, so no MicroShift-incompatible test surface was introduced.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PASS: The PR adds no new Ginkgo e2e tests; changed files only remove tests/examples, and no It/Describe/Context/When additions were found.
Topology-Aware Scheduling Compatibility	✅ Passed	Only CLI recommendation logic and test fixtures changed; no deployment/controller scheduling constraints or topology assumptions were added.
Ote Binary Stdout Contract	✅ Passed	Touched files only remove alert-handling/tests/examples; no main/init/TestMain/suite setup or klog/stdout writes were added.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	No new Ginkgo e2e tests were added; the PR only deletes tests/examples and tweaks unit-test fixtures, with no IPv4 or public-network assumptions.
No-Weak-Crypto	✅ Passed	No weak-crypto primitives, custom crypto, or secret/token comparisons appear in the patch; changes are limited to alerts/recommendation logic and fixture removals.
Container-Privileges	✅ Passed	No changed file adds a privileged container spec; the diff only touches CLI code and non-workload fixtures, and scans found no privileged/hostPID/allowPrivilegeEscalation hits.
No-Sensitive-Data-In-Logs	✅ Passed	PASS: The diff removes a klog warning and adds no new logging; no secret/PII-bearing log statements were introduced in the changed files.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

openshift-ci · 2026-07-22T16:40:03Z

@redhat-chai-bot: redhat-chai-bot unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file, and the following github teams:openshift: openshift-release-oversight openshift-staff-engineers openshift-sustaining-engineers.

Details

In response to this:

Revert of #2279

This reverts commit 54b7c12, reversing changes made to ae0477d.

Why

PR #2279 introduced a regression that is blocking the 5.0 nightly payload (5.0.0-0.nightly-2026-07-22-072716):

alertsEvaluatedByCVO() returns nil from alerts() when the ClusterUpdateAcceptRisks feature gate is enabled (TechPreview-only), removing the preamble line that tests expect from oc adm upgrade recommend output

Failing jobs: aws-ovn-techpreview-serial-1of3, aws-ovn-techpreview-serial-2of3 (both retries failed identically)

Root cause confidence: 100%

Details

Tracking: TRT-2817

A potential forward-fix (oc#2319) is open from the same author — the author should address the nil-handling issues before re-merging

/override ci/prow/e2e-agnostic-ovn-cmd
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-serial
/override ci/prow/e2e-aws-ovn-upgrade
/override ci/prow/e2e-aws-ovn-single-node
/override ci/prow/e2e-aws-ovn-crun

@petr-muller requested in Slack thread

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.

petr-muller · 2026-07-22T16:42:45Z

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3 periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3

openshift-ci · 2026-07-22T16:42:48Z

@petr-muller: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-1of3
periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5df920a0-85ec-11f1-9378-ea87e22d41c4-0

petr-muller · 2026-07-22T16:44:06Z

/uncc @atiratree @ingvagabund
/cc @nbottari9 @hongkailiu

neisw · 2026-07-22T17:44:26Z

/test verify-deps

neisw · 2026-07-22T20:41:52Z

/lgtm

openshift-merge-bot · 2026-07-22T20:42:14Z

Scheduling required tests:
/test e2e-agnostic-ovn-cmd
/test e2e-aws-ovn
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-upgrade

openshift-ci · 2026-07-22T20:42:17Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: neisw, redhat-chai-bot
Once this PR has been reviewed and has the lgtm label, please assign davidhurta for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

pkg/cli/admin/upgrade/OWNERS

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

neisw · 2026-07-22T20:47:12Z

/verified by payload-jobs

openshift-ci-robot · 2026-07-22T20:47:23Z

@neisw: This PR has been marked as verified by payload-jobs.

Details

In response to this:

/verified by payload-jobs

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.

neisw · 2026-07-22T20:54:00Z

/override ci/prow/e2e-agnostic-ovn-cmd
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-serial-1of2
/override ci/prow/e2e-aws-ovn-serial-2of2
/override ci/prow/e2e-aws-ovn-upgrade

validated via the payload jobs and first stage presubmits

openshift-ci · 2026-07-22T20:54:10Z

@neisw: Overrode contexts on behalf of neisw: ci/prow/e2e-agnostic-ovn-cmd, ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-serial-1of2, ci/prow/e2e-aws-ovn-serial-2of2, ci/prow/e2e-aws-ovn-upgrade

Details

In response to this:

/override ci/prow/e2e-agnostic-ovn-cmd
/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-serial-1of2
/override ci/prow/e2e-aws-ovn-serial-2of2
/override ci/prow/e2e-aws-ovn-upgrade

validated via the payload jobs and first stage presubmits

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.

neisw · 2026-07-22T20:54:18Z

/label approved

openshift-ci · 2026-07-22T23:14:31Z

@hongkailiu: This PR was included in a payload test run from #2322
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview-serial-2of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/160b6960-8623-11f1-80a8-fc7febfac843-0

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 22, 2026

openshift-ci Bot requested review from atiratree and ingvagabund July 22, 2026 16:40

openshift-ci Bot requested review from hongkailiu and nbottari9 and removed request for atiratree and ingvagabund July 22, 2026 16:44

petr-muller mentioned this pull request Jul 22, 2026

OTA-1814: fix(alerts): populate CVO-sourced risks in issues #2319

Open

openshift-ci Bot assigned neisw Jul 22, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 22, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2026

openshift-merge-bot Bot merged commit 9946130 into openshift:main Jul 22, 2026
15 checks passed

hongkailiu mentioned this pull request Jul 22, 2026

Revert "TRT-2817: Revert "Merge pull request #2279 from nbottari9/1814-duplicate-warning"" #2322

Open

Uh oh!

Conversation

redhat-chai-bot commented Jul 22, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Revert of #2279

Why

Details

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Jul 22, 2026

Uh oh!

openshift-ci-robot commented Jul 22, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Revert of #2279

Why

Details

Uh oh!

coderabbitai Bot commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

openshift-ci Bot commented Jul 22, 2026

Revert of #2279

Why

Details

Uh oh!

petr-muller commented Jul 22, 2026

Uh oh!

openshift-ci Bot commented Jul 22, 2026

Uh oh!

petr-muller commented Jul 22, 2026

Uh oh!

neisw commented Jul 22, 2026

Uh oh!

neisw commented Jul 22, 2026

Uh oh!

openshift-merge-bot Bot commented Jul 22, 2026

Uh oh!

openshift-ci Bot commented Jul 22, 2026

Uh oh!

neisw commented Jul 22, 2026

Uh oh!

openshift-ci-robot commented Jul 22, 2026

Uh oh!

neisw commented Jul 22, 2026

Uh oh!

openshift-ci Bot commented Jul 22, 2026

Uh oh!

neisw commented Jul 22, 2026

Uh oh!

Uh oh!

openshift-ci Bot commented Jul 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

redhat-chai-bot commented Jul 22, 2026 •

edited by coderabbitai Bot

Loading

openshift-ci-robot commented Jul 22, 2026 •

edited by openshift-ci Bot

Loading

coderabbitai Bot commented Jul 22, 2026 •

edited

Loading