Skip to content

OCPBUGS-83515: use internal shell image for catalog FBC curl Job - #792

Open
haklein wants to merge 1 commit into
openshift:mainfrom
haklein:OCPBUGS-83515-use-shell-image-for-curl-job
Open

OCPBUGS-83515: use internal shell image for catalog FBC curl Job#792
haklein wants to merge 1 commit into
openshift:mainfrom
haklein:OCPBUGS-83515-use-shell-image-for-curl-job

Conversation

@haklein

@hakleinhaklein commented Aug 18, 2026

Copy link
Copy Markdown

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.

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

@openshift-ci-robotopenshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate 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 Aug 18, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@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

coderabbitaiBot commented Aug 18, 2026

Copy link
Copy Markdown

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 nameStatusExplanationResolution
Docstring Coverage⚠️ WarningDocstring 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 nameStatusExplanation
Description Check✅ PassedCheck skipped - CodeRabbit’s high-level summary is enabled.
Title check✅ PassedThe title clearly identifies the catalog FBC curl Job change and the use of the internal shell image.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe diff changes only the curl Job image; it adds no Ginkgo tests and introduces no multi-node or HA assumption.
Topology-Aware Scheduling Compatibility✅ PassedThe 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✅ PassedThe 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✅ PassedThe 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✅ PassedThe diff only replaces the curl Job image; it introduces no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret comparison.
Container-Privileges✅ PassedThe 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✅ PassedThe 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.
✨ 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-ciopenshift-ciBot 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

Copy link
Copy Markdown
Contributor

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.

@openshift-ci

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: haklein
Once this PR has been reviewed and has the lgtm label, please assign grokspawn 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

@perdasilva

Copy link
Copy Markdown
Contributor

/ok-to-test

@openshift-ciopenshift-ciBot 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
@openshift-ci

Copy link
Copy Markdown
Contributor

@haklein: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test nameCommitDetailsRequiredRerun command
ci/prow/verify-commitsa71e420linktrue/test verify-commits

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/invalid-bugIndicates that a referenced Jira bug is invalid for the branch this PR is targeting.jira/severity-moderateReferenced Jira bug's severity is moderate for the branch this PR is targeting.jira/valid-referenceIndicates that this PR references a valid Jira ticket of any type.ok-to-testIndicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@haklein@openshift-ci-robot@perdasilva