Skip to content

OKD-322: Update OC-tools Dockerfile to work on CentOS/RHEL 10#2205

Open
jatinsu wants to merge 1 commit intoopenshift:mainfrom
jatinsu:cs10-fix
Open

OKD-322: Update OC-tools Dockerfile to work on CentOS/RHEL 10#2205
jatinsu wants to merge 1 commit intoopenshift:mainfrom
jatinsu:cs10-fix

Conversation

@jatinsu
Copy link

@jatinsu jatinsu commented Feb 18, 2026

Installation of iotop works on CentOS 10 but fails during verification as the iotop has been renamed to iotop-c in CentOS/RHEL 10.

Summary by CodeRabbit

  • Chores
    • Updated Docker image build to detect and install the appropriate iotop package variant for the runtime environment.
    • Preserves existing package verification and cleanup steps; adds a note about iotop deprecation on newer CentOS versions.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 18, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 18, 2026

@jatinsu: This pull request references OKD-322 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Installation of iotop works on CentOS 10 but fails during verification as the iotop has been renamed to iotop-c in CentOS/RHEL 10.

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link

coderabbitai bot commented Feb 18, 2026

No actionable comments were generated in the recent review. 🎉


Walkthrough

Adds runtime detection and selection of the iotop package in the Dockerfile: a deprecation comment is added; availability is checked with yum list iotop; IOTOP_PKG is set to either iotop or iotop-c; the install steps use the variable and perform RPM verification and cleanup.

Changes

Cohort / File(s) Summary
Dockerfile iotop detection & install
images/tools/Dockerfile
Adds comment about iotop deprecation; adds a yum list iotop availability check and sets IOTOP_PKG to iotop or iotop-c; replaces hard-coded iotop in INSTALL_PKGS with $IOTOP_PKG; updates RUN to conditionally install the chosen package and retain existing RPM verification/cleanup steps.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly summarizes the main change: updating the OC-tools Dockerfile to support CentOS/RHEL 10 by handling the iotop package rename.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed This custom check evaluates test titles for unstable or non-deterministic values, but the PR only modifies a Dockerfile with no test files added or modified.
Test Structure And Quality ✅ Passed The custom check for test code quality is not applicable to this PR. The PR only modifies a Dockerfile to address CentOS/RHEL 10 compatibility without adding any test code.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Comment @coderabbitai help to get the list of available commands and usage tips.

@jatinsu jatinsu changed the title OKD-322: Update Oc-tools Dockerfile to work on CentOS/RHEL 10 OKD-322: Update OC-tools Dockerfile to work on CentOS/RHEL 10 Feb 18, 2026
COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/
RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
RUN INSTALL_PKGS="\
RUN MAJOR_VERSION=$(. /etc/os-release && echo "${VERSION_ID%%.*}") && \
Copy link
Member

Choose a reason for hiding this comment

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

I think we should try to avoid testing based on OS versions;

What about this

Suggested change
RUN MAJOR_VERSION=$(. /etc/os-release && echo "${VERSION_ID%%.*}") && \
# iotop has been deprecated. iotop-c is used Cento10 and upwards
RUN if yum list iotop >/dev/null 2>&1; then IOTOP_PKG="iotop"; else IOTOP_PKG="iotop-c"; fi &&

I'd like to hear opinions from @ingvagabund as well

Copy link
Author

Choose a reason for hiding this comment

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

Works for me! I just tested this and it worked flawlessly. I'll wait to commit this until @ingvagabund gives their opinion.

Copy link
Member

Choose a reason for hiding this comment

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

Feel free to commit, we can wait his comments during review

Copy link
Member

Choose a reason for hiding this comment

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

Looks good :)

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 19, 2026

@jatinsu: This pull request references OKD-322 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Installation of iotop works on CentOS 10 but fails during verification as the iotop has been renamed to iotop-c in CentOS/RHEL 10.

Summary by CodeRabbit

  • Chores
  • Updated Docker image build process to automatically detect and install the appropriate package version based on the system environment, improving compatibility across different runtime platforms.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 19, 2026

@jatinsu: This pull request references OKD-322 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Installation of iotop works on CentOS 10 but fails during verification as the iotop has been renamed to iotop-c in CentOS/RHEL 10.

Summary by CodeRabbit

  • Chores
  • Updated Docker image build to detect and install the appropriate iotop package variant for the runtime environment.
  • Preserves existing package verification and cleanup steps; adds a note about iotop deprecation on newer CentOS versions.

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 openshift-eng/jira-lifecycle-plugin repository.

@ardaguclu
Copy link
Member

/retest
/lgtm
/hold
until CI is green

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2026
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 23, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ardaguclu, jatinsu

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 Feb 23, 2026
@jatinsu
Copy link
Author

jatinsu commented Feb 23, 2026

/retest

@ardaguclu
Copy link
Member

/retest
/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 24, 2026

@jatinsu: The following test 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/e2e-agnostic-ovn-cmd 189ac91 link true /test e2e-agnostic-ovn-cmd

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@ardaguclu
Copy link
Member

I think, this openshift/origin#30809 will fix the e2e-agnostic-ovn-cmd failure.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants