Skip to content

OCPBUGS-85828: Update catalogs for 4.23/5.0#734

Open
tmshort wants to merge 1 commit into
openshift:mainfrom
tmshort:update-catalog-tag
Open

OCPBUGS-85828: Update catalogs for 4.23/5.0#734
tmshort wants to merge 1 commit into
openshift:mainfrom
tmshort:update-catalog-tag

Conversation

@tmshort
Copy link
Copy Markdown
Contributor

@tmshort tmshort commented May 21, 2026

Fixes: OCPBUGS-85828

Set to ocp-release so that the catalogs can be set to the release version.

Summary by CodeRabbit

  • Chores
    • Updated operator catalog references to use the moving release tag instead of a fixed v4.22 tag.
    • Catalogs will now follow the current OCP release image stream for operator indices, ensuring catalog content stays aligned with the release.

@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-85828, which is invalid:

  • expected the bug to target only the "5.0.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

Fixes: OCPBUGS-85828

Set to ocp-release so that the catalogs can be set to the release version.

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
Copy link
Copy Markdown

coderabbitai Bot commented May 21, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 9f06434d-6e57-440d-b31c-e539bdef414c

📥 Commits

Reviewing files that changed from the base of the PR and between 1441769 and bd8cc25.

📒 Files selected for processing (3)
  • openshift/catalogd/manifests-experimental.yaml
  • openshift/catalogd/manifests.yaml
  • openshift/helm/catalogd.yaml
✅ Files skipped from review due to trivial changes (1)
  • openshift/helm/catalogd.yaml

Walkthrough

ClusterCatalog image references in both primary and experimental manifests were changed from the pinned v4.22 tag to ocp-release; the Helm chart options.catalogd.version was likewise updated from v4.22 to ocp-release.

Changes

Catalogd Configuration and Manifests

Layer / File(s) Summary
ClusterCatalogs (manifests.yaml)
openshift/catalogd/manifests.yaml
Updated spec.source.image.ref for openshift-certified-operators, openshift-community-operators, and openshift-redhat-operators from v4.22 to ocp-release.
ClusterCatalogs (manifests-experimental.yaml)
openshift/catalogd/manifests-experimental.yaml
Updated the same three ClusterCatalog image refs from v4.22 to ocp-release in the experimental manifests.
Helm chart option
openshift/helm/catalogd.yaml
Changed options.catalogd.version from v4.22 to ocp-release.

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 11 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning Ginkgo test file added lacks proper timeouts (no timeout context for external service calls), has no BeforeEach/AfterEach for setup/cleanup, and missing meaningful assertion messages on error checks. Add context timeouts for external operations, use BeforeEach/AfterEach for setup/cleanup, and add descriptive error messages to all Expect() assertions without messages.
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: updating catalogs from v4.22 to ocp-release tags for OCP 4.23/5.0 release preparation, which matches the changeset across all three modified files.
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 PR modifies only YAML configuration files; no Ginkgo tests are affected. The codebase uses standard Go testing, not Ginkgo patterns.
Microshift Test Compatibility ✅ Passed PR contains no new Ginkgo e2e tests; it only modifies configuration and Kubernetes manifest files (catalogd.yaml, manifests.yaml). MicroShift test compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only YAML configuration and Kubernetes manifest changes (catalogd.yaml, manifests.yaml, manifests-experimental.yaml), not new Ginkgo e2e tests. SNO compatibility check not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR only updates image tags from v4.22 to ocp-release. No scheduling constraints, affinity rules, nodeSelectors, or topology configurations are introduced.
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML configuration files (openshift/helm/catalogd.yaml and openshift/catalogd/manifests.yaml files) with no executable code; OTE Binary Stdout Contract check is not applicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only modifies YAML configuration files (openshift/helm/catalogd.yaml and openshift/catalogd/manifests*.yaml), not Ginkgo e2e test files. The custom check applies only to new test additions.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

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

3 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)
Details

In response to this:

Fixes: OCPBUGS-85828

Set to ocp-release so that the catalogs can be set to the release version.

Summary by CodeRabbit

  • Chores
  • Updated catalog deployment version configuration settings

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 camilamacedo86 and fgiudici May 21, 2026 18:06
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tmshort

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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 21, 2026
Fixes: OCPBUGS-85828

Signed-off-by: Todd Short <tshort@redhat.com>
@tmshort tmshort force-pushed the update-catalog-tag branch from 1441769 to bd8cc25 Compare May 21, 2026 20:06
@openshift-ci-robot
Copy link
Copy Markdown

@tmshort: This pull request references Jira Issue OCPBUGS-85828, which is valid.

3 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 POST, which is one of the valid states (NEW, ASSIGNED, POST)
Details

In response to this:

Fixes: OCPBUGS-85828

Set to ocp-release so that the catalogs can be set to the release version.

Summary by CodeRabbit

  • Chores
  • Updated operator catalog references to use the moving release tag instead of a fixed v4.22 tag.
  • Catalogs will now follow the current OCP release image stream for operator indices, ensuring catalog content stays aligned with the release.

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 22, 2026

@tmshort: 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-aws-olmv1-ext bd8cc25 link true /test e2e-aws-olmv1-ext
ci/prow/default-catalog-consistency bd8cc25 link true /test default-catalog-consistency
ci/prow/openshift-e2e-aws bd8cc25 link true /test openshift-e2e-aws
ci/prow/e2e-aws-techpreview-olmv1-ext bd8cc25 link true /test e2e-aws-techpreview-olmv1-ext
ci/prow/e2e-aws-upgrade-ovn-single-node bd8cc25 link false /test e2e-aws-upgrade-ovn-single-node

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.

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/severity-critical Referenced Jira bug's severity is critical 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants