Skip to content

Add MCE 2.11 image configs for remaining 8 components#11299

Merged
ashwindasr merged 7 commits into
openshift-eng:mce-2.11from
girish1430:mce-2.11-remaining-8
Jun 22, 2026
Merged

Add MCE 2.11 image configs for remaining 8 components#11299
ashwindasr merged 7 commits into
openshift-eng:mce-2.11from
girish1430:mce-2.11-remaining-8

Conversation

@girish1430

@girish1430 girish1430 commented Jun 17, 2026

Copy link
Copy Markdown

Summary

Adds ocp-build-data configurations for the remaining 8 MCE 2.11 images that were not part of the initial 24-component onboarding (PR #10730).

New Image Configs

Simple (no prefetch needed)

Image Source Repo Branch Dockerfile
hypershift-cli openshift/hypershift release-4.21 Containerfile.cli
hypershift-release openshift/hypershift release-4.21 Containerfile.operator
capoa-bootstrap openshift-assisted/cluster-api-provider-openshift-assisted backplane-2.11 Dockerfile.bootstrap-provider
capoa-control-plane openshift-assisted/cluster-api-provider-openshift-assisted backplane-2.11 Dockerfile.controlplane-provider
cluster-api-provider-agent openshift/cluster-api-provider-agent release-ocm-2.16 Dockerfile.rhtap

With cachito prefetch

Image Source Repo Branch Prefetch
image-based-install-operator openshift/image-based-install-operator backplane-2.11 gomod (path: .)
cluster-api-provider-kubevirt openshift/cluster-api-provider-kubevirt release-4.21 gomod (path: .) + pkg_managers: [gomod] (extra hack/tools/go.mod)

Complex

Image Source Repo Branch Notes
hive openshift/hive master Multi-stage (EL8+EL9 builders), RPM prefetch from hack/hermetic, CONTAINER_SUB_MANAGER_OFF=1 modification

Other Changes

  • group.yml: Added openshift-assisted to public_upstreams (needed for CAPOA repos)
  • streams.yml: Added rhel-8-golang-1.25 stream (needed by hive's EL8 builder stage, image ref sourced from OCP 4.21)

Branch Verification

All branches verified against konflux-release-data rendered configs:

  • openshift label components → release-4.21
  • ocm label components → release-ocm-2.16
  • backplane components → backplane-2.11
  • hive → master

Test Plan

  • Trigger test builds for all 8 components via ART pipeline
  • Verify hermetic builds pass for IBIO, CAPK, and hive
  • Confirm hive multi-stage build correctly uses EL8 and EL9 golang builders

Made with Cursor

@girish1430 @cursoragent
Add MCE 2.11 image configs for remaining 8 components
6d2f479 
New images:
- hypershift-cli (openshift/hypershift, release-4.21)
- hypershift-release (openshift/hypershift, release-4.21)
- capoa-bootstrap (openshift-assisted/cluster-api-provider-openshift-assisted, backplane-2.11)
- capoa-control-plane (openshift-assisted/cluster-api-provider-openshift-assisted, backplane-2.11)
- cluster-api-provider-agent (openshift/cluster-api-provider-agent, release-ocm-2.16)
- image-based-install-operator (openshift/image-based-install-operator, backplane-2.11)
- cluster-api-provider-kubevirt (openshift/cluster-api-provider-kubevirt, release-4.21)
- hive (openshift/hive, master)

Also:
- group.yml: Add openshift-assisted to public_upstreams
- streams.yml: Add rhel-8-golang-1.25 stream (needed by hive EL8 builder stage)

Co-authored-by: Cursor <cursoragent@cursor.com>
@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 17, 2026
@openshift-ci

openshift-ci Bot commented Jun 17, 2026

Copy link
Copy Markdown
Contributor

Hi @girish1430. Thanks for your PR.

I'm waiting for a openshift-eng 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.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

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.

girish1430 and others added 4 commits June 18, 2026 11:44
@girish1430 @cursoragent
Fix public_upstreams: use per-repo entries for non-stolostron repos
18700b1 
The blanket openshift-priv -> openshift-assisted mapping was being
applied to all repos, breaking the 6 images whose public upstream
is under openshift/ (not openshift-assisted/). Following the OCP 4.21
pattern: specific repo entries first, general stolostron default last.

Co-authored-by: Cursor <cursoragent@cursor.com>
@girish1430 @cursoragent
Fix public_upstreams: use per-image public_upstream instead of group.yml
30a8a76 
Revert group.yml to only the stolostron default. Add per-image
public_upstream fields for all 8 non-stolostron repos:
- CAPOA (2 images): openshift-assisted org
- hypershift, hive, CAPK, IBIO, CAPA (6 images): openshift org

Co-authored-by: Cursor <cursoragent@cursor.com>
@girish1430 @cursoragent
Simplify public_upstream: URL only, no branch needed
9129c80 
Doozer already uses content.source.git.branch.target when fetching
from public_upstream. The branch block is only needed when the public
repo uses a different branch than the private one.

Co-authored-by: Cursor <cursoragent@cursor.com>
@girish1430 @cursoragent
Fix public_upstreams: per-repo entries in group.yml (logging-6.4 patt…
c0e6ba6 
…ern)

Per-image public_upstream fields are not supported by doozer. Use
per-repo public_upstreams entries in group.yml instead, following the
logging-6.4 pattern: general stolostron default + specific overrides
for repos under openshift/ and openshift-assisted/ orgs.

Co-authored-by: Cursor <cursoragent@cursor.com>
@girish1430 girish1430 mentioned this pull request Jun 22, 2026
Merged
girish1430 and others added 2 commits June 22, 2026 12:03
@girish1430 @cursoragent
Fix hypershift-release: remove --chown=default unsupported by ART bui…
798c2f0 
…lder

ART's openshift-golang-builder doesn't have a 'default' user unlike
the upstream ubi9/go-toolset image. Strip --chown=default from COPY
to fix the build failure.

Co-authored-by: Cursor <cursoragent@cursor.com>
@girish1430 @cursoragent
Remove .DS_Store and images/.gitkeep
626318a 
Co-authored-by: Cursor <cursoragent@cursor.com>
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2026
@openshift-ci

openshift-ci Bot commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashwindasr

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:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2026
@ashwindasr ashwindasr merged commit 48f6600 into openshift-eng:mce-2.11 Jun 22, 2026
1 check was pending
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ashwindasr ashwindasr ashwindasr approved these changes

Assignees

@ashwindasr ashwindasr

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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@girish1430 @ashwindasr