OCPBUGS-83515: UPSTREAM: <carry>: use internal shell image for catalog FBC curl Job by haklein · Pull Request #792 · openshift/operator-framework-operator-controller

haklein · 2026-08-18T14:56:56Z

This PR replaces the hardcoded image registry.redhat.io/rhel8/httpd-24:latest (445MB) in buildCurlJob() with image.ShellImage(), the node-cached openshift/tools image. A slow pull could exceed the 5-minute test timeout. All six FBC endpoint specs (/v1/api/all and /v1/api/metas for the three openshift catalogs) share buildCurlJob(), this change fixes all of them. No architectural changes.

Testing

All six specs pass on OpenShift 4.20.17 with a binary from this branch
Same Job with old image and new image, giving identical curl results.

Fixes OCPBUGS-83515 (https://issues.redhat.com/browse/OCPBUGS-83515)

Summary by CodeRabbit

Bug Fixes
- Updated the curl verification job to use the configured shell image, improving compatibility with the deployment environment.

openshift-merge-bot · 2026-08-18T14:56:59Z

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

openshift-ci-robot · 2026-08-18T14:57:03Z

@haklein: This pull request references Jira Issue OCPBUGS-83515, which is invalid:

expected the bug to target the "5.1.0" version, but no target version was 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:

This PR replaces the hardcoded image registry.redhat.io/rhel8/httpd-24:latest (445MB) in buildCurlJob() with image.ShellImage(), the node-cached openshift/tools image. A slow pull could exceed the 5-minute test timeout. All six FBC endpoint specs (/v1/api/all and /v1/api/metas for the three openshift catalogs) share buildCurlJob(), this change fixes all of them. No architectural changes.

Testing

All six specs pass on OpenShift 4.20.17 with a binary from this branch

Same Job with old image and new image, giving identical curl results.

Fixes OCPBUGS-83515 (https://issues.redhat.com/browse/OCPBUGS-83515)

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 · 2026-08-18T14:57:28Z

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: Pro Plus

Run ID: dec4d93d-5e4f-4c44-8ad8-dbe078345aef

📥 Commits

Reviewing files that changed from the base of the PR and between 19afc52 and a71e420.

📒 Files selected for processing (1)

openshift/tests-extension/test/olmv1-catalog.go

Included review availability: Your plan includes up to 1 review per rolling hour; 0 remain after this review.

Walkthrough

The catalog verification Job changes its api-tester container image from the RHEL8 HTTPD image to the configured shell image.

Changes

Catalog verification Job

Layer / File(s)	Summary
Use configured shell image `openshift/tests-extension/test/olmv1-catalog.go`	The `api-tester` container now uses `image.ShellImage()` instead of `registry.redhat.io/rhel8/httpd-24:latest`.

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

Merge Risk: ⚪ Minimal · up to a71e4

The catalog endpoint test Job now uses the node-cached internal shell image instead of a large external image, reducing pull-timeout risk while preserving curl behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (14 passed)

Check name	Status	Explanation
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	The only PR change replaces the Job image; no Ginkgo test title changed. Existing Describe and It titles use static catalog and endpoint text, with dynamic values kept in test bodies.
Test Structure And Quality	✅ Passed	The PR changes only the Job image. Existing endpoint tests retain DeferCleanup, bounded Eventually waits, and diagnostic assertion messages; no stated quality issue is introduced.
Microshift Test Compatibility	✅ Passed	The diff changes only the curl Job image; it adds no Ginkgo tests, so the MicroShift test-compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The diff changes only the curl Job image; it adds no Ginkgo tests and introduces no multi-node or HA assumption.
Topology-Aware Scheduling Compatibility	✅ Passed	The diff changes only the curl Job container image from HTTPD to image.ShellImage(); it adds no scheduling constraints or topology assumptions.
Ote Binary Stdout Contract	✅ Passed	The diff only changes the Job image field. ShellImage() returns a pull spec without stdout output, and buildCurlJob is called from a test case, not process-level setup.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The diff changes only the curl Job image; it adds no Ginkgo tests, IPv4 literals, or external URLs. The curl target remains the ClusterCatalog cluster-internal base URL.
No-Weak-Crypto	✅ Passed	The diff only replaces the curl Job image; it introduces no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret comparison.
Container-Privileges	✅ Passed	The only PR change replaces the Job image; the PodSpec sets no privileged, host namespace, SYS_ADMIN, root-user, or allowPrivilegeEscalation option.
No-Sensitive-Data-In-Logs	✅ Passed	The diff changes only the Job image from a hardcoded HTTPD image to image.ShellImage(); it adds no logging or sensitive-data output. Existing URL logging is unchanged.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly identifies the main change: using the internal shell image for the catalog FBC curl Job.

✨ 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.}

openshift-ci · 2026-08-18T14:58:26Z

Hi @haklein. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

perdasilva · 2026-08-19T13:31:51Z

/ok-to-test

buildCurlJob() pulled the external 445MB image registry.redhat.io/rhel8/httpd-24 to run one curl command. A slow pull (observed: 7m12s) exceeded the 5-minute test timeout although catalogd was healthy. image.ShellImage() resolves to the node-cached openshift/tools image with bash and curl. Fixes OCPBUGS-83515 Signed-off-by: Harald Klein <hklein@redhat.com>

tmshort

/approve
/lgtm
It's pretty small.

tmshort · 2026-08-20T15:15:02Z

 					Containers: []corev1.Container{{
 						Name:    "api-tester",
-						Image:   "registry.redhat.io/rhel8/httpd-24:latest",
+						Image:   image.ShellImage(),


This is used in other places; the direct image is not.
This was the only odd location that needed to be fixed.

openshift-merge-bot · 2026-08-20T15:16:35Z

Scheduling required tests:
/test e2e-aws-olmv1-ext
/test e2e-aws-techpreview-olmv1-ext
/test e2e-gcp-ovn-upgrade
/test openshift-e2e-aws-techpreview

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test openshift-e2e-aws

openshift-ci · 2026-08-20T15:17:02Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haklein, 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:

~~DOWNSTREAM_OWNERS~~ [tmshort]

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

tmshort · 2026-08-20T21:05:07Z

/retest

tmshort · 2026-08-21T14:38:03Z

/retest

tmshort · 2026-08-21T14:40:49Z

/jira refresh

openshift-ci-robot · 2026-08-21T14:40:53Z

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

expected the bug to target the "5.1.0" version, but no target version was 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:

/jira refresh

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 · 2026-08-21T14:42:23Z

/jira refresh

openshift-ci-robot · 2026-08-21T14:42:29Z

@tmshort: This pull request references Jira Issue OCPBUGS-83515, 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.1.0) matches configured target version for branch (5.1.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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 · 2026-08-21T18:45:46Z

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

openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 18, 2026

openshift-ci Bot requested review from fgiudici and grokspawn August 18, 2026 14:58

openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 19, 2026

haklein force-pushed the OCPBUGS-83515-use-shell-image-for-curl-job branch from a71e420 to 51b8626 Compare August 20, 2026 14:45

haklein changed the title ~~OCPBUGS-83515: use internal shell image for catalog FBC curl Job~~ OCPBUGS-83515: UPSTREAM: <carry>: use internal shell image for catalog FBC curl Job Aug 20, 2026

tmshort approved these changes Aug 20, 2026

View reviewed changes

openshift-ci Bot assigned tmshort Aug 20, 2026

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

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

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 Aug 21, 2026

Uh oh!

Conversation

haklein commented Aug 18, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

openshift-merge-bot Bot commented Aug 18, 2026

Uh oh!

openshift-ci-robot commented Aug 18, 2026

Uh oh!

coderabbitai Bot commented Aug 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

❌ Failed checks (1 warning)

Uh oh!

openshift-ci Bot commented Aug 18, 2026

Uh oh!

perdasilva commented Aug 19, 2026

Uh oh!

tmshort left a comment

Choose a reason for hiding this comment

Uh oh!

tmshort Aug 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented Aug 20, 2026

Uh oh!

openshift-ci Bot commented Aug 20, 2026

Uh oh!

tmshort commented Aug 20, 2026

Uh oh!

tmshort commented Aug 21, 2026

Uh oh!

tmshort commented Aug 21, 2026

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

tmshort commented Aug 21, 2026

Uh oh!

openshift-ci-robot commented Aug 21, 2026

Uh oh!

openshift-ci Bot commented Aug 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

haklein commented Aug 18, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Aug 18, 2026 •

edited

Loading

tmshort Aug 20, 2026 •

edited

Loading