Skip to content

TRT-2776: Revert #1398 "install: Split multi-document YAML and add missing annotations"#1420

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
redhat-chai-bot:revert-1398-1783563071689
Jul 9, 2026
Merged

TRT-2776: Revert #1398 "install: Split multi-document YAML and add missing annotations"#1420
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
redhat-chai-bot:revert-1398-1783563071689

Conversation

@redhat-chai-bot

@redhat-chai-bot redhat-chai-bot commented Jul 9, 2026

Copy link
Copy Markdown

Reverts #1398 ; tracked by TRT-2776

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

This PR introduces a cluster-update-console-plugin deployment gated by TechPreviewNoUpgrade. Two failure mechanisms:

  1. The container image (built from ubi9/nginx-120:latest) is missing the nginx binary on RHEL 10, causing CreateContainerError, ProgressDeadlineExceeded, and CVO Failing=True on all TechPreview jobs (AWS, Azure, GCP, vSphere, metal).

  2. The new manifest uses {{index .Images "cluster-update-console-plugin"}}, but .Images does not exist in the 4.22 CVO's payload.manifestRenderConfig type. This causes ReleaseAccepted=False (reason: LoadPayload) and blocks all 4.22→5.0 major upgrades.

This is causing 7 of 9 blocking job failures on 5.0 nightly payloads. Rejection streak: 8 payloads since baseline (5.0.0-0.nightly-2026-07-05-172708, 69h ago).

AI payload analysis report

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

CC: @jhadvig

…ugin-manifests"

This reverts commit 46ba644, reversing
changes made to 78fc02c.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 9, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: This pull request references TRT-2776 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:

Reverts #1398 ; tracked by TRT-2776

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

This PR introduces a cluster-update-console-plugin deployment gated by TechPreviewNoUpgrade. Two failure mechanisms:

  1. The container image (built from ubi9/nginx-120:latest) is missing the nginx binary on RHEL 10, causing CreateContainerError, ProgressDeadlineExceeded, and CVO Failing=True on all TechPreview jobs (AWS, Azure, GCP, vSphere, metal).

  2. The new manifest uses {{index .Images "cluster-update-console-plugin"}}, but .Images does not exist in the 4.22 CVO's payload.manifestRenderConfig type. This causes ReleaseAccepted=False (reason: LoadPayload) and blocks all 4.22→5.0 major upgrades.

This is causing 7 of 9 blocking job failures on 5.0 nightly payloads. Rejection streak: 8 payloads since baseline (5.0.0-0.nightly-2026-07-05-172708, 69h ago).

AI payload analysis report

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

/payload-with-prs openshift/cluster-version-operator#NNNN 5.0.0-0.nightly e2e-aws-ovn-techpreview
/payload-with-prs openshift/cluster-version-operator#NNNN 5.0.0-0.nightly e2e-gcp-ovn-rt-upgrade-from-stable-4.22

CC: @jhadvig

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

coderabbitai Bot commented Jul 9, 2026

Copy link
Copy Markdown

Walkthrough

This PR deletes all install manifests for the cluster-update-console-plugin component (namespace, serviceaccount, networkpolicy, configmap, deployment, service, consoleplugin) and its image-references entry. render_test.go is updated to remove the associated image override and stop skipping image-references during manifest validation.

Changes

Console Plugin Manifest Removal

Layer / File(s) Summary
Delete console plugin install manifests
install/0000_50_cluster-update-console-plugin_10_namespace.yaml, install/0000_50_cluster-update-console-plugin_15_serviceaccount.yaml, install/0000_50_cluster-update-console-plugin_20_networkpolicy.yaml, install/0000_50_cluster-update-console-plugin_30_configmap.yaml, install/0000_50_cluster-update-console-plugin_50_deployment.yaml, install/0000_50_cluster-update-console-plugin_60_service.yaml, install/0000_50_cluster-update-console-plugin_90_consoleplugin.yaml, install/image-references
All Kubernetes manifests (namespace, service account, network policy, config map, deployment, service, console plugin) and the image stream tag for cluster-update-console-plugin are removed.
Render test adjustments
pkg/payload/render_test.go
The Images map override for cluster-update-console-plugin is removed, and the walk logic no longer skips image-references files, so those files are now validated like other manifests.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

  • openshift/cluster-version-operator#1398: Added/restored the same cluster-update-console-plugin manifests and adjusted the same render_test.go handling of image-references that this PR reverses.

Suggested reviewers: wking

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
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 render_test.go only changes setup/assertion logic; the diff adds no It/Describe/Context/When titles, and existing subtest names are static.
Test Structure And Quality ✅ Passed No Ginkgo tests were modified; the touched test is a plain Go unit test with no cluster setup, waits, or cleanup risks.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the commit only removes manifests and edits a standard Go unit test.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS: The patch only reverts manifests and adjusts a unit test; no new Ginkgo e2e tests or multi-node/SNO assumptions were added.
Topology-Aware Scheduling Compatibility ✅ Passed The PR only removes the console-plugin manifests and a test exception; it adds no node selectors, anti-affinity, spread constraints, or replica logic.
Ote Binary Stdout Contract ✅ Passed The only Go change is test-only logic in render_test.go; no main/init/TestMain/suite stdout writes or log redirection changes were added.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR only removes manifests and tweaks a unit test; no new Ginkgo e2e tests were added, and no IPv4 or external-connectivity assumptions appear.
No-Weak-Crypto ✅ Passed PR only deletes Kubernetes manifests and trims a test fixture; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret-comparison code appears in the diff.
Container-Privileges ✅ Passed PASS — the PR only removes manifests/test code, and the deleted deployment had allowPrivilegeEscalation:false, runAsNonRoot:true, and no host* or SYS_ADMIN settings.
No-Sensitive-Data-In-Logs ✅ Passed PR only deletes console-plugin manifests and a test override; no new log statements or sensitive values were added. Removed nginx log config had no secrets/PII.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately states this is a revert of PR #1398, matching the manifest removals and test rollback in the diff.
✨ 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.

@sosiouxme

Copy link
Copy Markdown
Member

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3
/label accepted
/label lgtm

@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@sosiouxme: The label(s) /label accepted , /label lgtm cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, rebase/manual, cluster-config-api-changed, run-integration-tests, verified, ready-for-human-review, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/skip-dependent-bug-check, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3
/label accepted
/label lgtm

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.

@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@sosiouxme: Overrode contexts on behalf of sosiouxme: ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3

Details

In response to this:

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3
/label accepted
/label lgtm

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.

@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: 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.

@sosiouxme

Copy link
Copy Markdown
Member

/verified by e2e-aws-ovn-techpreview
/lgtm
/accepted

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

Copy link
Copy Markdown
Contributor

@sosiouxme: This PR has been marked as verified by e2e-aws-ovn-techpreview.

Details

In response to this:

/verified by e2e-aws-ovn-techpreview
/lgtm
/accepted

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.

@sosiouxme

Copy link
Copy Markdown
Member

/label approved

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

Copy link
Copy Markdown
Member

/label lgtm

@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@sosiouxme: The label(s) /label lgtm cannot be applied. These labels are supported: acknowledge-critical-fixes-only, platform/aws, platform/azure, platform/baremetal, platform/google, platform/libvirt, platform/openstack, ga, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, px-approved, docs-approved, qe-approved, ux-approved, no-qe, rebase/manual, cluster-config-api-changed, run-integration-tests, verified, ready-for-human-review, approved, backport-risk-assessed, bugzilla/valid-bug, cherry-pick-approved, jira/skip-dependent-bug-check, jira/valid-bug, ok-to-test, stability-fix-approved, staff-eng-approved. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

Details

In response to this:

/label lgtm

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.

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

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: redhat-chai-bot, sosiouxme
Once this PR has been reviewed and has the lgtm label, please assign wking 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:

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

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

Copy link
Copy Markdown
Member

/label approved

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 9, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 56154f7 into openshift:main Jul 9, 2026
20 checks passed
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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants