Skip to content

[SREP-4777] Switch to a multi-cluster image that is based on UBI.#905

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
bergmannf:srep-4777-use-mg-image
Jun 2, 2026
Merged

[SREP-4777] Switch to a multi-cluster image that is based on UBI.#905
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
bergmannf:srep-4777-use-mg-image

Conversation

@bergmannf

@bergmannf bergmannf commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Replace old images with upstream images.

Summary by CodeRabbit

  • Chores
    • Updated the must-gather image for ACM functionality to use a RHEL9 image from registry.redhat.io (requires registry authentication).
    • The ACM image can now be configured via the --acm_image flag.

@coderabbitai

coderabbitai Bot commented Jun 2, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@bergmannf, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 32 minutes and 34 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 476d00b0-aa65-44a9-8b47-9d192e212721

📥 Commits

Reviewing files that changed from the base of the PR and between e9c01bb and 171b02d.

📒 Files selected for processing (3)
  • cmd/hcp/mustgather/mustGather.go
  • docs/README.md
  • docs/osdctl_hcp_must-gather.md

Walkthrough

The change updates the ACM must-gather image used by the hcp gather target from a hardcoded Quay snapshot to a newer registry.redhat.io RHEL9 image. The hcp gather flow is modified to use the configurable --acm_image flag value instead of a hardcoded constant when invoking createMustGather.

Changes

ACM must-gather image

Layer / File(s) Summary
Default image and hcp gather logic
cmd/hcp/mustgather/mustGather.go
defaultAcmImage constant changed to registry.redhat.io multicluster-engine image; hcp gather flow updated to invoke createMustGather with mg.acmMustGatherImage instead of hardcoded acmHyperShiftImage.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 2 warnings)

Check name Status Explanation Resolution
No-Sensitive-Data-In-Logs ❌ Error Code logs full stderr from external commands (lines 264-266) containing sensitive data: auth tokens, certificate errors, or credentials from registry authentication failures. Filter stderr before logging; log only generic error summaries without exposing command output that may contain credentials or authentication details.
Title check ⚠️ Warning The PR title references switching to a 'multi-cluster image based on UBI', but the raw summary describes switching to a 'registry.redhat.io RHEL9 image' for the ACM must-gather functionality. While both involve image updates, the title's emphasis on 'multi-cluster' appears misaligned with the core change of updating the ACM must-gather image. Revise the title to accurately reflect the primary change: updating the ACM must-gather image from Quay snapshot to a RHEL9 registry.redhat.io image, such as 'Update ACM must-gather image to RHEL9-based image' or similar.
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 (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
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 PR modifies cmd/hcp/mustgather/mustGather.go (production code) and mustGather_test.go (which uses standard Go testing, not Ginkgo). No Ginkgo test framework usage found in the repository.
Test Structure And Quality ✅ Passed mustGather_test.go uses Go standard testing with testify, not Ginkgo. No Ginkgo patterns (Describe/It/BeforeEach) found. Check is not applicable to this test suite.
Microshift Test Compatibility ✅ Passed PR adds Ginkgo unit tests in cmd//xxx_test.go and pkg//xxx_test.go files, not e2e tests. Custom check targets e2e tests that interact with Kubernetes clusters; these don't use cluster-specific APIs.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The PR modifies cmd/hcp/mustgather/mustGather.go, a command utility not a Ginkgo e2e test file. No new Ginkgo tests are added, so the SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies a CLI tool to change the ACM must-gather image URL. No deployment manifests, operator code, controllers, or scheduling constraints are introduced—the check is not applicable.
Ote Binary Stdout Contract ✅ Passed osdctl is a CLI tool for OSD management, not an OTE binary. OTE binaries must communicate via JSON on stdout with openshift-tests; this is a regular Cobra CLI tool.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR does not add any new Ginkgo e2e tests. Changes are limited to production code in mustGather.go that updates the default ACM must-gather image. Check not applicable.
No-Weak-Crypto ✅ Passed PR modifies mustGather.go to switch image references. No weak crypto algorithms or custom crypto implementations present in the changes.
Container-Privileges ✅ Passed PR only updates an image reference in a CLI tool. No Kubernetes manifests or container privilege configurations are created or modified.
✨ 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 and usage tips.

@openshift-ci openshift-ci Bot requested review from devppratik and zmird-r June 2, 2026 13:35
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 2, 2026
@bergmannf bergmannf force-pushed the srep-4777-use-mg-image branch from e9c01bb to 171b02d Compare June 2, 2026 14:02
@openshift-ci

openshift-ci Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

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

@rolandmkunkel

Copy link
Copy Markdown
Contributor

/lgtm
/approve

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

openshift-ci Bot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bergmannf, rolandmkunkel

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:
  • OWNERS [bergmannf,rolandmkunkel]

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

@openshift-merge-bot openshift-merge-bot Bot merged commit c2c03f9 into openshift:master Jun 2, 2026
7 checks passed
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants