Skip to content

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

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
tmshort:update-catalog-tag
Jun 17, 2026
Merged

OCPBUGS-85828: Update catalogs for 4.23/5.0#734
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
tmshort:update-catalog-tag

Conversation

@tmshort

@tmshort tmshort commented May 21, 2026

Copy link
Copy Markdown
Contributor

Set catalog image tags to v5.0 for the 4.23/5.0 release.

Fixes: OCPBUGS-85828

Summary by CodeRabbit

  • Chores

    • Updated OLM catalogd and operator index image references from v4.22 to v5.0 across the Helm catalog and ClusterCatalog manifests.
  • Tests

    • Added dynamic discovery of an installable OLM package/catalog for test runs and updated the disconnected OLMv1 install test to use the discovered values.
    • Adjusted registry-auth-related test logging to write to standard error instead of standard output.

@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

coderabbitai Bot commented May 21, 2026

Copy link
Copy Markdown

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

Upgrades catalogd and ClusterCatalog image tags from v4.22 to v5.0, introduces a new catalog discovery helper that dynamically selects an installable OLMv1 GA package from serving ClusterCatalogs, updates the OLMv1 test to use the discovered package instead of hard-coded values, and adjusts test logging to stderr.

Changes

Catalogd upgrade and test improvements

Layer / File(s) Summary
Catalogd version and ClusterCatalog image tag updates
openshift/helm/catalogd.yaml, openshift/catalogd/manifests.yaml, openshift/catalogd/manifests-experimental.yaml
Helm options.catalogd.version and three ClusterCatalog spec.source.image.ref entries updated from v4.22 to v5.0.
Catalog discovery helper implementation
openshift/tests-extension/pkg/helpers/catalog_discovery.go
New helper module implementing FindInstallablePackage(ctx) to search serving ClusterCatalogs for installable GA packages: lists catalogs, filters by TypeServing condition, queries catalogd /api/v1/all endpoint with 404-retry logic, scans JSONL response for olm.package entries, validates GA install requirements (AllNamespaces support, no required dependencies), and returns best-ranked preferred package or fallback match.
OLMv1 test dynamic package discovery integration
openshift/tests-extension/test/olmv1.go
Test replaces hard-coded quay-operator package with dynamic discovery via helpers.FindInstallablePackage(ctx), updates cleanup and ClusterExtension creation to use discovered catalog and package values, and adjusts log messaging to reference the selected package.
Test logging stream adjustment
openshift/default-catalog-consistency/test/validate/suite_test.go
Registry auth informational logging redirected from stdout to stderr using fmt.Fprintf.

Sequence Diagram(s)

sequenceDiagram
  participant Test as OLMv1 Test
  participant K8sAPI as Kubernetes API
  participant Catalogd as catalogd Proxy
  participant Scanner as scanPackages

  Test->>K8sAPI: List ClusterCatalogs
  K8sAPI-->>Test: catalog list
  Test->>Test: filter TypeServing=True
  Test->>Catalogd: GET /api/v1/all (with 404-retry)
  Catalogd-->>Test: JSONL response
  Test->>Scanner: feed JSONL
  Scanner-->>Test: ranked or fallback package
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning Helper function catalog_discovery.go has two test quality issues: FindInstallablePackage lacks retry logic for waiting for serving catalogs (can fail immediately on startup), and scanPackages uses... Add retry loop to wait for serving catalogs before failing, and sort package names before iteration in fallback selection to ensure deterministic test behavior.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main change: updating catalog image tags from v4.22 to v5.0 for the OCP 4.23/5.0 release across multiple manifest files.
Docstring Coverage ✅ Passed Docstring coverage is 87.50% which is sufficient. The required threshold is 80.00%.
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 Test names in modified files are stable and deterministic. In suite_test.go, test names like "validates image: certified-operator-index" derive from repository paths in static manifests. In olmv1.g...
Microshift Test Compatibility ✅ Passed This PR does not add any NEW Ginkgo e2e tests (It(), Describe(), Context(), When(), etc.). It only modifies an existing test in olmv1.go and adds a new helper file. The check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added in this PR. The PR modified an existing test (line 78-122 in olmv1.go with [Skipped:Disconnected] label) to use dynamic package selection instead of hard-coded va...
Topology-Aware Scheduling Compatibility ✅ Passed No scheduling constraints were introduced or modified in this PR. Changes are limited to catalog version tags (v4.22→v5.0) and test code. Pre-existing scheduling constraints in catalogd.yaml were u...
Ote Binary Stdout Contract ✅ Passed All stdout writes in the PR comply with OTE Binary Stdout Contract: suite_test.go writes to os.Stderr, catalog_discovery.go writes to GinkgoWriter, and all test code is within It() blocks where out...
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The test accessing the new FindInstallablePackage helper is already marked [Skipped:Disconnected] and uses RFC 3986-compliant IPv6 URL construction (cfg.Host includes scheme; e.g., https://[::1]:64...
No-Weak-Crypto ✅ Passed No weak cryptographic algorithms (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), custom crypto implementations, or non-constant-time secret/token comparisons were detected in the PR.
Container-Privileges ✅ Passed PR contains no privileged: true, hostPID/hostNetwork/hostIPC, SYS_ADMIN capability, runAsUser: 0, or allowPrivilegeEscalation: true. Containers have secure settings: runAsNonRoot: true and allowPri...
No-Sensitive-Data-In-Logs ✅ Passed No sensitive data (passwords, tokens, API keys, PII, auth file paths) is exposed in logs. Auth file path is handled securely without logging, and all other logging statements use safe non-sensitive...

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

@tmshort

tmshort commented May 26, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@camilamacedo86

Copy link
Copy Markdown
Contributor

Hi @tmshort the default catalog tests uses the images from here so will fail see:

https://github.com/openshift/operator-framework-operator-controller/blob/main/openshift/default-catalog-consistency/test/utils/utils.go#L20-L49

@tmshort

tmshort commented May 27, 2026

Copy link
Copy Markdown
Contributor Author

Hi @tmshort the default catalog tests uses the images from here so will fail see:

https://github.com/openshift/operator-framework-operator-controller/blob/main/openshift/default-catalog-consistency/test/utils/utils.go#L20-L49

@camilamacedo86:

I expected CI to fail (because those catalogs are not available yet), but did not consider the default-cartalog-consistency tests. Thanks.

@tmshort tmshort force-pushed the update-catalog-tag branch from bd8cc25 to b3db3f1 Compare May 27, 2026 18:51

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@openshift/default-catalog-consistency/test/validate/suite_test.go`:
- Around line 33-39: The suite setup currently uses fmt.Println in the var _ =
Describe initialization (see utils.ClusterCatalogVersion and the images loop)
which emits non-JSON stdout and leaks REGISTRY_AUTH_FILE; replace those
fmt.Println calls with GinkgoWriter (or fmt.Fprintln(os.Stderr, ...)) so output
goes to test logs/stderr instead of stdout, and remove or redact printing of the
REGISTRY_AUTH_FILE value (e.g., log that an auth file is configured without
printing the path). Ensure changes are applied where ClusterCatalogVersion() is
handled and in the second print near the REGISTRY_AUTH_FILE usage so no non-JSON
stdout is emitted during suite init.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 3b56e87e-9ee0-49e3-a5c1-a73d44857a2c

📥 Commits

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

📒 Files selected for processing (5)
  • openshift/catalogd/manifests-experimental.yaml
  • openshift/catalogd/manifests.yaml
  • openshift/default-catalog-consistency/test/utils/utils.go
  • openshift/default-catalog-consistency/test/validate/suite_test.go
  • openshift/helm/catalogd.yaml
✅ Files skipped from review due to trivial changes (1)
  • openshift/helm/catalogd.yaml
🚧 Files skipped from review as they are similar to previous changes (2)
  • openshift/catalogd/manifests-experimental.yaml
  • openshift/catalogd/manifests.yaml

Comment thread openshift/default-catalog-consistency/test/validate/suite_test.go Outdated
@tmshort tmshort force-pushed the update-catalog-tag branch from b3db3f1 to 6312355 Compare May 27, 2026 19:14
@tmshort

tmshort commented May 27, 2026

Copy link
Copy Markdown
Contributor Author

/hold

This is expected to fail until v4.23 and v5.0 catalogs are available.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 27, 2026
@tmshort tmshort force-pushed the update-catalog-tag branch from 6312355 to da150a1 Compare June 1, 2026 15:16
@tmshort

tmshort commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

Seems that openshift-redhat-operators is available for 4.23, but not the other two

@tmshort

tmshort commented Jun 4, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort tmshort force-pushed the update-catalog-tag branch 2 times, most recently from a39b6ea to d5a66d0 Compare June 8, 2026 20:32
@ankitathomas

Copy link
Copy Markdown
Contributor

/retest

@ankitathomas ankitathomas left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 15, 2026
@tmshort

tmshort commented Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

/retest

Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
@tmshort tmshort force-pushed the update-catalog-tag branch from 55bc4b5 to 0a3fddb Compare June 16, 2026 15:46
Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
@tmshort tmshort force-pushed the update-catalog-tag branch 2 times, most recently from fe9b3e7 to caab2a4 Compare June 16, 2026 17:48
Comment thread openshift/tests-extension/pkg/helpers/catalog_discovery.go Outdated
Set catalog image tags to v5.0 for the 4.23/5.0 release.

Dynamically discover an installable package from the serving catalogs
instead of hardcoding quay-operator v3.13.10, preferring quay-operator,
cluster-logging, serverless-operator, logic-operator in that order then
alling back to the first available package.

Signed-off-by: Todd Short <tshort@redhat.com>
@tmshort tmshort force-pushed the update-catalog-tag branch from caab2a4 to 4fe2e7d Compare June 16, 2026 17:54
@tmshort

tmshort commented Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort

tmshort commented Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

/test openshift-e2e-aws

1 similar comment
@tmshort

tmshort commented Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

/test openshift-e2e-aws

@joelanford

Copy link
Copy Markdown
Member

/lgtm

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

@rashmigottipati rashmigottipati 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.

/lgtm

@openshift-ci

openshift-ci Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, perdasilva, rashmigottipati, 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 commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

@tmshort: 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.

@Leo6Leo

Leo6Leo commented Jun 17, 2026

Copy link
Copy Markdown

/verified by @Leo6Leo

verification passed, spinned up the cluster with cluster-bot and the PR in it

oc get clustercatalogs -o jsonpath='{range .items[*]}{.metadata.name}{"\t"}{.spec.source.image.ref}{"\n"}{end}'

openshift-certified-operators   registry.redhat.io/redhat/certified-operator-index:v4.23
openshift-community-operators   registry.redhat.io/redhat/community-operator-index:v4.23
openshift-redhat-operators      registry.redhat.io/redhat/redhat-operator-index:v4.23

@openshift-ci-robot

Copy link
Copy Markdown

@Leo6Leo: This PR has been marked as verified by @Leo6Leo.

Details

In response to this:

/verified by @Leo6Leo

verification passed, spinned up the cluster with cluster-bot and the PR in it

oc get clustercatalogs -o jsonpath='{range .items[*]}{.metadata.name}{"\t"}{.spec.source.image.ref}{"\n"}{end}'

openshift-certified-operators   registry.redhat.io/redhat/certified-operator-index:v4.23
openshift-community-operators   registry.redhat.io/redhat/community-operator-index:v4.23
openshift-redhat-operators      registry.redhat.io/redhat/redhat-operator-index:v4.23

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-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 17, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 9a3ec7c into openshift:main Jun 17, 2026
17 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: Jira Issue Verification Checks: Jira Issue OCPBUGS-85828
✔️ 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-85828 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:

Set catalog image tags to v5.0 for the 4.23/5.0 release.

Fixes: OCPBUGS-85828

Summary by CodeRabbit

  • Chores

  • Updated OLM catalogd and operator index image references from v4.22 to v5.0 across the Helm catalog and ClusterCatalog manifests.

  • Tests

  • Added dynamic discovery of an installable OLM package/catalog for test runs and updated the disconnected OLMv1 install test to use the discovered values.

  • Adjusted registry-auth-related test logging to write to standard error instead of standard output.

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.

@tmshort tmshort deleted the update-catalog-tag branch June 17, 2026 19:44
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. 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.

8 participants