Skip to content

[release-5.0] OCPBUGS-114388: display operators in catalog when Tech Preview enabled - #17100

Merged
openshift-merge-bot[bot] merged 3 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-16976-to-release-5.0
Aug 27, 2026
Merged

[release-5.0] OCPBUGS-114388: display operators in catalog when Tech Preview enabled#17100
openshift-merge-bot[bot] merged 3 commits into
openshift:release-5.0from
openshift-cherrypick-robot:cherry-pick-16976-to-release-5.0

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #16976

/assign sdodson

simkam and others added 3 commits August 26, 2026 16:12
useCatalogItems returned `loading = true` (in progress) as the second
element of its tuple, but CatalogExtensionHookResolver treats the second
element as `loaded = true` (ready). This caused the catalog to call
onValueResolved immediately with an empty array, then never again once
real items arrived from /api/olm/catalog-items/.

Rename `loading` to `loaded` and invert the initial state (false → true
on completion) in both useCatalogItems and useCatalogCategories.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
The OLMv0 console.catalog/item-type for "operator" had no flag guard,
causing it to remain active alongside the OLMv1 item-type when
OLMV1_ENABLED=true. This produced a duplicate "Operators" entry in the
catalog type selector.

Add the same disallowed: [OLMV1_ENABLED] flag that already gates the
OLMv0 item-provider, so only the OLMv1 item-type is active when OLMv1
is enabled.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…ering

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 01d78fb1-805a-4b2e-b6bb-ec42531978c3

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@sdodson

sdodson commented Aug 26, 2026

Copy link
Copy Markdown
Member

/uncc
/cc @simkam

@openshift-ci
openshift-ci Bot requested a review from simkam August 26, 2026 16:13
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-85646 has been cloned as Jira Issue OCPBUGS-114388. Will retitle bug to link to clone.
/retitle [release-5.0] OCPBUGS-114388: display operators in catalog when Tech Preview enabled

Details

In response to this:

This is an automated cherry-pick of #16976

/assign sdodson

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 changed the title [release-5.0] OCPBUGS-85646: display operators in catalog when Tech Preview enabled [release-5.0] OCPBUGS-114388: display operators in catalog when Tech Preview enabled Aug 26, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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 Aug 26, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-85646 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-85646 targets the "5.1.0" version, which is one of the valid target versions: 5.1.0
  • bug has dependents

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

Details

In response to this:

This is an automated cherry-pick of #16976

/assign sdodson

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 jhadvig and rhamilto August 26, 2026 16:13
@openshift-ci openshift-ci Bot added the component/olm Related to OLM label Aug 26, 2026
@simkam

simkam commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-gcp-console
/test e2e-playwright

@logonoff logonoff left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 27, 2026
@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: logonoff, openshift-cherrypick-robot, simkam
Once this PR has been reviewed and has the lgtm label, please assign therealjon 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 commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: The following test 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-playwright 9906290 link false /test e2e-playwright

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.

@sdodson

sdodson commented Aug 27, 2026

Copy link
Copy Markdown
Member

/label approved
/verified by CI

@sdodson

sdodson commented Aug 27, 2026

Copy link
Copy Markdown
Member

/cherry-pick release-4.22

@openshift-cherrypick-robot

Copy link
Copy Markdown
Author

@sdodson: once the present PR merges, I will cherry-pick it on top of release-4.22 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.22

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 27, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 27, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@sdodson: This PR has been marked as verified by CI.

Details

In response to this:

/label approved
/verified by CI

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-merge-bot
openshift-merge-bot Bot merged commit f632d1e into openshift:release-5.0 Aug 27, 2026
9 of 10 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-114388
✔️ 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-114388 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:

This is an automated cherry-pick of #16976

/assign sdodson

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-cherrypick-robot

Copy link
Copy Markdown
Author

@sdodson: #17100 failed to apply on top of branch "release-4.22":

Applying: fix(olm-v1): correct inverted loaded/loading semantics in catalog hooks
Applying: fix(olm): disable OLMv0 operator item-type when OLMv1 is enabled
Applying: test(olm): add Playwright tests for operator catalog display and filtering
Using index info to reconstruct a base tree...
A	frontend/e2e/tests/dev-console/catalog.spec.ts
A	test-prow-playwright-e2e-techpreview.sh
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): frontend/e2e/tests/dev-console/catalog.spec.ts deleted in HEAD and modified in test(olm): add Playwright tests for operator catalog display and filtering.  Version test(olm): add Playwright tests for operator catalog display and filtering of frontend/e2e/tests/dev-console/catalog.spec.ts left in tree.
CONFLICT (modify/delete): test-prow-playwright-e2e-techpreview.sh deleted in HEAD and modified in test(olm): add Playwright tests for operator catalog display and filtering.  Version test(olm): add Playwright tests for operator catalog display and filtering of test-prow-playwright-e2e-techpreview.sh left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0003 test(olm): add Playwright tests for operator catalog display and filtering

Details

In response to this:

/cherry-pick release-4.22

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-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 5.0.0-0.nightly-2026-08-27-222048

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. component/olm Related to OLM jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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.

6 participants