Skip to content

List packagemanifests by CATALOG in scripts/gen-rhosls.sh - #59

Open
lpiwowar wants to merge 1 commit into
openstack-k8s-operators:mainfrom
lpiwowar:lpiwowar/fix-gen-rhosls
Open

List packagemanifests by CATALOG in scripts/gen-rhosls.sh#59
lpiwowar wants to merge 1 commit into
openstack-k8s-operators:mainfrom
lpiwowar:lpiwowar/fix-gen-rhosls

Conversation

@lpiwowar

Copy link
Copy Markdown
Collaborator

With the new release to the community-operators catalog (v0.0.2) the "make kuttl-test-ocp" Makefile target is failing (and probably others).

The issue is that scripts/gen-rhosls.sh looks up the packagemanifest by name (openstack-lightspeed-operator) only, without filtering by catalog. Because the community-operators catalog also ships a packagemanifest with that same name, the lookup is ambiguous and can return the community CSV_VERSION (v0.0.2) instead of the version from the catalog we build internally as part of "make kuttl-test-ocp".

This commit filters packagemanifests by the catalog label so that we pick only the packagemanifest coming from the ${CATALOG} catalog.

With the new release to the community-operators catalog (v0.0.2) the
"make kuttl-test-ocp" Makefile target is failing (and probably others).

The issue is that scripts/gen-rhosls.sh looks up the packagemanifest by
name (openstack-lightspeed-operator) only, without filtering by catalog.
Because the community-operators catalog also ships a packagemanifest
with that same name, the lookup is ambiguous and can return the
community CSV_VERSION (v0.0.2) instead of the version from the catalog
we build internally as part of "make kuttl-test-ocp".

This commit filters packagemanifests by the catalog label so that we
pick only the packagemanifest coming from the ${CATALOG} catalog.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci

openshift-ci Bot commented Aug 20, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lpiwowar

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

@coderabbitai

coderabbitai Bot commented Aug 20, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: c80f393a-714d-471e-a97a-a3e427aea46b

📥 Commits

Reviewing files that changed from the base of the PR and between 9b2ad9b and b759315.

📒 Files selected for processing (1)
  • scripts/gen-rhosls.sh

Included review availability: Your plan provides up to 12 included reviews per hour; 10 remain after this review.


📝 Walkthrough

Summary by CodeRabbit

  • Bug Fixes
    • Improved retrieval of the operator’s current version for the requested channel.
    • Added filtering across matching package manifests to select the correct catalog and channel.

Walkthrough

The RHOSLS generation script now lists matching Packagemanifest resources and selects the current CSV from the requested channel.

Changes

RHOSLS generation

Layer / File(s) Summary
Packagemanifest channel resolution
scripts/gen-rhosls.sh
The script lists Packagemanifest resources with operator and catalog selectors, then scans returned channels for the requested channel CSV.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Merge Risk: ⚪ Minimal · up to b7593

The script now limits packagemanifest selection to the intended catalog; no actionable merge-blocking risk remains beyond normal checks and review.

Suggested reviewers: umago, akrog

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly describes the main change: filtering packagemanifests by the catalog in scripts/gen-rhosls.sh.
Description check ✅ Passed The description explains the catalog ambiguity and the filtering change in scripts/gen-rhosls.sh.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1 files.
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.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@lpiwowar lpiwowar changed the title List packagemanifests by CATALOG in scripts/gen-rhosls.sh List packagemanifests by CATALOG in scripts/gen-rhosls.sh Aug 20, 2026
@lpiwowar
lpiwowar marked this pull request as ready for review August 21, 2026 11:30
@openshift-ci
openshift-ci Bot requested review from Akrog and umago August 21, 2026 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant