Add Konflux build support for node image#1932
Conversation
Add dedicated Containerfile.konflux and konflux-build-node-image.sh for building the OCP node image via Konflux. These new files are fully independent of the existing Containerfile and build-node-image.sh, allowing both build paths to coexist on master without risk of breaking existing builds. Key differences from the existing build path: - Uses direct rpm-ostree install instead of treefile-apply - Does not reference packages-openshift.yaml - Embeds all postprocess steps inline in the build script - No OPENSHIFT_CI conditional logic (Konflux handles repo injection) - No OKD/CentOS-specific repo filtering This is a follow-up to openshift#1929 and is part of the effort tracked in ART-14453 to get node layer RHCOS builds to Konflux. This is intended as a starting point for discussion. The Containerfile base image reference and other details will need to be refined as the Konflux build pipeline is set up.
|
@redhat-ship-help: GitHub didn't allow me to request PR reviews from the following users: openshift/team-coreos. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. DetailsIn response to this:
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
Bot
added
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: redhat-ship-help The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
openshift-ci
Bot
added
the
needs-ok-to-test
|
Hi @redhat-ship-help. 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 Tip We noticed you've done this a few times! Consider joining the org to skip this step and gain Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
|
Testing with openshift-eng/ocp-build-data#10135 |
|
/ok-to-test |
openshift-ci
Bot
added
ok-to-test
| # in the branch-specific packages-openshift.yaml. For master, we use | ||
| # the latest version. | ||
| cat >> /usr/lib/os-release <<EOF | ||
| OPENSHIFT_VERSION="4.22" |
There was a problem hiding this comment.
| OPENSHIFT_VERSION="4.22" | |
| OPENSHIFT_VERSION="4.23" |
|
Did you see #1919 BTW? That'll impact Konflux onboarding. See also https://redhat.atlassian.net/browse/ART-14812. It's currently stuck on CI (which, would appreciate help with that if you can!): #1919 (comment) |
Apply review suggestion from PR openshift#1932.
|
Ah I was not aware of that, checking 👍 |
3 participants
Summary
Follow-up to #1929. Adds dedicated Konflux build files for the OCP node image, keeping the existing build path untouched.
New files
Containerfile.konflux— Dedicated Containerfile for Konflux builds. Same multi-stage structure as the existingContainerfile(build → metadata → final) but callskonflux-build-node-image.shinstead ofbuild-node-image.sh.konflux-build-node-image.sh— Standalone build script for Konflux. Usesrpm-ostree installdirectly (instead ofrpm-ostree experimental compose treefile-applywithpackages-openshift.yaml). All postprocess steps frompackages-openshift.yamlare embedded inline.Key design decisions
Containerfile,build-node-image.sh, orpackages-openshift.yaml. Both build paths coexist onmaster.packages-openshift.yamlreference — package list and postprocess steps are self-contained in the new script.--konfluxflag) — keeps the two build paths fully independent so they can evolve in parallel.What this enables
This is a starting point to get Konflux builds working for the node image. The intent is to be able to build something and have Scott, MCO, RHCOS, and others review the results by enabling the builds.
TODO
Containerfile.konfluxfor the Konflux pipelinerpm-ostree installproduces equivalent results totreefile-applyPart of ART-14453.
/cc @openshift/team-coreos
This PR was drafted by Ship Help Bot on behalf of the ART team as a starting point for discussion.