Skip to content

Conversation

@dbkreling
Copy link
Contributor

@dbkreling dbkreling commented Nov 18, 2025

Update ubi reference from 9.6-1760340943 to 10.1-1762189261 on the operator, must-gather and podvm-builder.

Update references to ubi-minimal tags to 10.1-1763362715

Also add the ubi.repo.

Issue: https://issues.redhat.com/browse/KATA-4311

This commit updates ubi reference from 9.6-1760340943 to 10.1-1762189261.

Signed-off-by: Daniel Kreling <[email protected]>
Dockerfile Outdated

# Use OpenShift base image
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1760515502
FROM registry.access.redhat.com/ubi10/ubi-minimal:10.1-1762189261
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is bumping the operator as well, maybe update the patch title to ... (must-gather, operator) ?

gkurz
gkurz previously approved these changes Nov 18, 2025
Copy link
Member

@gkurz gkurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the suggested commit title fix and the right tag for ubi10 minimal 😉

/lgtm

Thanks @dbkreling !

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Nov 18, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 19, 2025

New changes are detected. LGTM label has been removed.

@dbkreling dbkreling changed the title Update ubi references to ubi 10 Update must-gather and operator ubi references to ubi 10 Nov 19, 2025
@littlejawa
Copy link
Contributor

littlejawa commented Nov 19, 2025

You will need to add a RPM lockfile for the operator's build now that you install packages in it.
Also, do you really need the redhat.repo file for must-gather? It seems all the packages referenced in the lock file come from ubi repo... I think we don't need a subscription to build the must-gather actually.

@gkurz gkurz dismissed their stale review November 19, 2025 11:49

Dismissing my review as there's obviously more to it...

@dbkreling
Copy link
Contributor Author

Last forced push removed the redhat.repo for must-gather and also added "rpms.in.yaml" and "rpms.lock.file".

Tzdata was stripped down from ubi-minimal version 10 [0].
Although no direct documentation was found for shadow-utils, "useradd" is failing
to build, so a direct install is necessary.

With those additions, new rpms.in.yaml and rpms.lock.yaml files are necessary.

[0] https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/10/html/considerations_in_adopting_rhel_10/containers

Signed-off-by: Daniel Kreling <[email protected]>
@openshift-ci
Copy link

openshift-ci bot commented Nov 19, 2025

@dbkreling: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/sandboxed-containers-operator-e2e 8313e86 link false /test sandboxed-containers-operator-e2e
ci/prow/images 8313e86 link true /test images
ci/prow/ci-index-openshift-sandboxed-containers-operator-bundle 8313e86 link true /test ci-index-openshift-sandboxed-containers-operator-bundle

Full PR test history. Your PR dashboard.

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.

@wainersm
Copy link
Contributor

Hi @dbkreling ! The ci/prow/* jobs are failing because they are still using the rhel-9 buildroot as you suspected.

The current base image is base-rhel9 (see https://github.com/openshift/release/blob/master/ci-operator/config/openshift/sandboxed-containers-operator/openshift-sandboxed-containers-operator-devel.yaml#L5) and we will need to bump to base-rhel10. I don't know if base-rhel10 is available in 4.19, otherwise we will need to bump the line https://github.com/openshift/release/blob/master/ci-operator/config/openshift/sandboxed-containers-operator/openshift-sandboxed-containers-operator-devel.yaml#L3 too.

I think above is enough, but more things to consider:

  • It will also run binary_build_commands (line 6) in a container with rhel-9-golang-1.24-openshift-4.20 (line 11). Do we want rhel-10 too?
  • Likewise GOFLAGS="" make test in line 39.
  • In line 20, instructs to replace registry.redhat.io/openshift-sandboxed-containers/osc-rhel9-operator@sha256:.* with the just built operator image in the bundle image. We need to check if this should be changed too.

dbkreling added a commit to dbkreling/release that referenced this pull request Nov 21, 2025
PR openshift/sandboxed-containers-operator#1367 is
bumping OSC versions to ubi and ubi-minimal 10, and
we have to bump the base image.

Signed-off-by: Daniel Kreling <[email protected]>
wainersm pushed a commit to wainersm/openshift-release that referenced this pull request Nov 21, 2025
PR openshift/sandboxed-containers-operator#1367 is
bumping OSC versions to ubi and ubi-minimal 10, and
we have to bump the base image.

Signed-off-by: Daniel Kreling <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants