openshift/os: update release-4.22 ci-operator config for build-args changes#81971
openshift/os: update release-4.22 ci-operator config for build-args changes#81971aaradhak wants to merge 1 commit into
Conversation
…hanges Backport of openshift#78212 for the release-4.22 branch. In openshift/os#1946, the Containerfile changes from a hardcoded FROM image to using `ARG IMAGE_FROM`. It also adds a `generate-labels` script that needs IMAGE_NAME and IMAGE_CPE to produce labels.json and OCI security labels for Clair scanning. Since ci-operator doesn't support build-args files, we need to: 1. Add `${IMAGE_FROM}` to the `as` list so ci-operator knows to replace `FROM ${IMAGE_FROM}` with the rhel-coreos-base image. 2. Pass IMAGE_NAME and IMAGE_CPE as explicit build args. Both the old FROM value and `${IMAGE_FROM}` are in the `as` list so that CI works regardless of which PR merges first (this one or openshift#1946).
openshift-ci
Bot
added
the
approved
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Enterprise Run ID: 📒 Files selected for processing (1)
WalkthroughThe OpenShift 4.22 OS release configuration adds image metadata build arguments and expands the ChangesOpenShift 4.22 OS release
Estimated code review effort: 1 (Trivial) | ~2 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
|
@aaradhak: 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aaradhak, Rolv-Apneseth 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 |
2 participants
Backport of #78212 for the release-4.22 branch.
In openshift/os#1946, we're backporting the labels.json and OCI security labels changes which require the Containerfile to use ARG IMAGE_FROM=overridden instead of a hardcoded FROM and to require IMAGE_NAME/IMAGE_CPE build args for RHCOS builds.
Since ci-operator doesn't support build-args files, we need to:
Add
${IMAGE_FROM}to theaslist so ci-operator knows toreplace
FROM ${IMAGE_FROM}with the rhel-coreos-base image.Pass IMAGE_NAME and IMAGE_CPE as explicit build args.