Skip to content

build: rebase cephcsi container image to Rocky Linux 10 - #6413

Merged
mergify[bot] merged 3 commits into
ceph:develfrom
shatadru:build-el10
Aug 3, 2026
Merged

mergify[bot] merged 3 commits into
ceph:develfrom
shatadru:build-el10

Conversation

@shatadru

@shatadru shatadru commented Jul 23, 2026 •

Copy link
Copy Markdown
Contributor

The cephcsi image still built on CentOS Stream 9 packages while upstream Ceph has moved to Rocky Linux 10.

This change moves the builder and final stage to Rocky Linux 10, install Tentacle client RPMs from the el10 ceph-release repo, and enable CRB repo.

This drops the el9 ceph:v20 builder base and the stream9-minimal final image in favour of rockylinux:10 and rockylinux:10-minimal.

Fixes #6411

Describe what this PR does

Provide some context for the reviewer

Is there anything that requires special attention

Do you have any questions?

Is the change backward compatible?

Are there concerns around backward compatibility?

Provide any external context for the change, if any.

For example:

  • Kubernetes links that explain why the change is required
  • CSI spec related changes/catch-up that necessitates this patch
  • golang related practices that necessitates this change

Related issues

Mention any github issues relevant to this PR. Adding below line
will help to auto close the issue once the PR is merged.

Fixes: #issue_number

Future concerns

List items that are not part of the PR and do not impact it's
functionality, but are work items that can be taken up subsequently.

Checklist:

  • Commit Message Formatting: Commit titles and messages follow
    guidelines in the developer
    guide
    .
  • Reviewed the developer guide on Submitting a Pull
    Request
  • Pending release
    notes

    updated with breaking and/or notable changes for the next major release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

Show available bot commands

These commands are normally not required, but in case of issues, leave any of
the following bot commands in an otherwise empty comment in this PR:

  • /retest ci/centos/<job-name>: retest the <job-name> after unrelated
    failure (please report the failure too!)

@mergify mergify Bot added the component/build Issues and PRs related to compiling Ceph-CSI label Jul 23, 2026

@nixpanic nixpanic left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @shatadru , this looks reasonable to me. I've just got one question for you, please check.

Comment thread build.env Outdated

# Ceph version to use
BASE_IMAGE=quay.io/ceph/ceph:v20
BASE_IMAGE=docker.io/rockylinux/rockylinux:10

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why not docker.io/rockylinux/rockylinux:10-minimal here too?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

As I thought the builder is kind of throwaway and the minimal image and we would need to install all the build tools with RUN.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Right, it is easier for the builder image to be more complete so that installing additional tools is simpler.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@nixpanic, you would need to add this image to ci/centos. a75413c

docker.io/rockylinux/rockylinux:10 quay.io/docker.io/rockylinux/rockylinux:10'

Trying to pull registry-ceph-csi.apps.ocp.cloud.ci.centos.org/docker.io/rockylinux/rockylinux:10...

Error: unable to copy from source docker://registry-ceph-csi.apps.ocp.cloud.ci.centos.org/docker.io/rockylinux/rockylinux:10: initializing source docker://registry-ceph-csi.apps.ocp.cloud.ci.centos.org/docker.io/rockylinux/rockylinux:10: reading manifest 10 in registry-ceph-csi.apps.ocp.cloud.ci.centos.org/docker.io/rockylinux/rockylinux: manifest unknown

script returned exit code 125

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Included the rockylinux:10 image with #6428 now too.

@nixpanic

Copy link
Copy Markdown
Member

You also need to update scripts/Dockerfile.devel, which is used for building a test container-image (contains a few more tools that CI jobs use).

@nixpanic
nixpanic requested a review from iPraveenParihar July 24, 2026 08:54

@nixpanic nixpanic left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think this is pretty complete now , thanks!

Comment thread build.env Outdated

# Ceph version to use
BASE_IMAGE=quay.io/ceph/ceph:v20
BASE_IMAGE=docker.io/rockylinux/rockylinux:10

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Right, it is easier for the builder image to be more complete so that installing additional tools is simpler.

@nixpanic

Copy link
Copy Markdown
Member

/test ci/centos/mini-e2e/k8s-1.37

2 similar comments
@shatadru

Copy link
Copy Markdown
Contributor Author

/test ci/centos/mini-e2e/k8s-1.37

@nixpanic

Copy link
Copy Markdown
Member

/test ci/centos/mini-e2e/k8s-1.37

@nixpanic

Copy link
Copy Markdown
Member

/test ci/centos/mini-e2e/k8s-1.37

Pulling the images and building this PR works fine. CI job

If everything is included in the container-image, the e2e job is expected to pass as well.

nixpanic
nixpanic previously approved these changes Jul 28, 2026
@nixpanic
nixpanic requested a review from a team July 29, 2026 09:43
Comment thread deploy/cephcsi/image/Dockerfile Outdated
ARG GO_ARCH
ARG BASE_IMAGE
ARG FINAL_BASE_IMAGE="quay.io/centos/centos:stream9-minimal"
ARG FINAL_BASE_IMAGE="docker.io/rockylinux/rockylinux:10-minimal"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

dont we get in to pull limit problem for using this from docker.io? can we use https://quay.io/repository/rockylinux/rockylinux?tab=tags&tag=latest?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

yeah, uUsing quay.io would be nicer. We mirror the images in the CI repository already, so the limits from Docker Hub should not affect us (maybe with GitHub actions, but I don't remember we ever hit them there?).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done.

@mergify
mergify Bot dismissed nixpanic’s stale review July 31, 2026 14:54

Pull request has been modified.

@nixpanic

Copy link
Copy Markdown
Member

/test ci/centos/mini-e2e/k8s-1.37

@nixpanic
nixpanic requested a review from Madhu-1 July 31, 2026 15:01
@shatadru

Copy link
Copy Markdown
Contributor Author

/test ci/centos/mini-e2e/k8s-1.37

@nixpanic

nixpanic commented Aug 3, 2026

Copy link
Copy Markdown
Member

/queue

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

@Mergifyio rebase

@mergify

mergify Bot commented Aug 3, 2026 •

Copy link
Copy Markdown
Contributor

rebase

🛑 The pull request rule doesn't match anymore

Details

This action has been cancelled.

The cephcsi image still built on CentOS Stream 9 packages while upstream
Ceph has moved to Rocky Linux 10.

This change moves the builder and final stage to Rocky Linux 10,
install Tentacle client RPMs from the el10 ceph-release repo,
and enable CRB repo.

This drops the el9 ceph:v20 builder base and the stream9-minimal final
image in favour of rockylinux:10 and rockylinux:10-minimal.

Fixes ceph#6411

Signed-off-by: Shatadru Bandyopadhyay <[email protected]>
Apply the same el10 ceph-release and CRB repository changes to the CI
devel container image used by containerized-test jobs.

Signed-off-by: Shatadru Bandyopadhyay <[email protected]>
@ceph-csi-bot ceph-csi-bot added ok-to-test Label to trigger E2E tests and removed queued/rebase labels Aug 3, 2026
@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.35

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.35

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.36

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.35

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.36

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.34

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.36

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.34

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/mini-e2e/k8s-1.34

@ceph-csi-bot ceph-csi-bot added ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. and removed ok-to-test Label to trigger E2E tests labels Aug 3, 2026
@mergify mergify Bot removed the ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. label Aug 3, 2026
@mergify

mergify Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

Deprecation notice: This pull request comes from a fork and was queued with update_method=rebase and update_bot_account impersonation. This capability will be removed on July 1, 2026. After this date, the merge queue will no longer be able to rebase fork pull requests with this configuration. To avoid disruption, switch to update_method=merge in your queue rule.

@mergify

mergify Bot commented Aug 3, 2026 •

Copy link
Copy Markdown
Contributor

Merge Queue Status

  • ✅ Entered queue — 2026-08-03 12:12 UTC · Rule: default · triggered by merge protections
  • ✅ Checks skipped · PR is already up-to-date
  • ✅ Merged — 2026-08-03 12:13 UTC · at 31b36326d0a2b5dbfd20133ddb0af65ef66d0727 · rebase

This pull request spent 15 seconds in the queue, including 2 seconds running CI.

Required conditions to merge

@mergify
mergify Bot merged commit 4e9dacd into ceph:devel Aug 3, 2026
43 checks passed
@shatadru
shatadru deleted the build-el10 branch August 11, 2026 11:08
@jeremy-preseem

Copy link
Copy Markdown

This changes the CPU requirements. x86-64-v3 is now required.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component/build Issues and PRs related to compiling Ceph-CSI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rebase cephcsi image to el10

6 participants