fix(cli-yq): use multi-arch base image for arm64 support - #82620
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThe ChangesCLI yq image build
Estimated code review effort: 2 (Simple) | ~10 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 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
`@clusters/build-clusters/build-shared/supplemental-ci-images/cli-yq_mabc.yaml`:
- Around line 22-29: Update the architecture selection in the RUN command so it
explicitly maps aarch64 to the arm64 archive and x86_64 to the standard archive,
while rejecting all other values with a nonzero exit before curl runs. Preserve
the existing URL and extraction flow for supported architectures.
- Around line 30-36: Update the yq download step in the RUN command to install
the executable from /tmp/yq into a directory on PATH, such as /usr/local/bin/yq,
while preserving the architecture selection and download behavior.
🪄 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 YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 679520ce-6289-4ca5-a147-1ff90f7b6b82
📒 Files selected for processing (1)
clusters/build-clusters/build-shared/supplemental-ci-images/cli-yq_mabc.yaml
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Prucek The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@Prucek: |
Switch from ocp_4.18_cli (amd64-only) to ocp_4.19_base-rhel9 (amd64+arm64) and install oc client from the OpenShift mirror.
|
[REHEARSALNOTIFIER] Note: If this PR includes changes to step registry files ( Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
@Prucek: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Summary
ocp_4.18_cli(amd64-only) toocp_4.19_base-rhel9which supports both amd64 and arm64occlient from the OpenShift mirror since the new base image doesn't include ituname -mSummary by CodeRabbit
Updates the
cli-yqsupplemental CI image configuration to support arm64 by switching to the multi-architecturequay.io/openshift/ci:ocp_4.19_base-rhel9base image. The embedded Dockerfile now downloads the architecture-matchedocclient tarball from the OpenShift 4.19 client mirror based onuname -m(x86_64 vs aarch64) and extracts it into/usr/local/bin. It also improves theyqinstall by selectingyq_linux_amd64vsyq_linux_arm64dynamically from GitHub releases, usingcurl --fail --retry 3, placing the binary in/usr/local/bin, and ensuring it’s executable (withjqstill installed viayum install -y jq).