Skip to content

OCPNODE-3874: Remove the dead code of setting the operator status for cgroupv1 based clusters #5399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 19, 2025
Merged

OCPNODE-3874: Remove the dead code of setting the operator status for cgroupv1 based clusters #5399

merged 1 commit into from
Nov 19, 2025
+0 −32

Conversation

@sairameshv
Copy link
Member

@sairameshv sairameshv commented Nov 10, 2025 •
edited
Loading

  • Option of configuring cgroupv1 has been removed in OCP - 4.19
  • It is safe to remove this check from the operator status for all the clusters greater than OCP - 4.19

Reference: #5397 (comment)

@sairameshv sairameshv mentioned this pull request Nov 10, 2025
Merged
QiWang19
QiWang19 reviewed Nov 10, 2025
View reviewed changes
Copy link
Member

@QiWang19 QiWang19 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2025
wking
wking reviewed Nov 10, 2025
View reviewed changes
pkg/operator/status.go
if err != nil {
return err
}
if configNode.Spec.CgroupMode == configv1.CgroupModeV1 {
Copy link
Member

@wking wking Nov 10, 2025

Choose a reason for hiding this comment

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

Can you also remove this CgroupModeV1 constant from the API repo? Simplifying API docs by removing options we no longer allow users to set seems like a win with no downsides.

Copy link
Member Author

@sairameshv sairameshv Nov 11, 2025

Choose a reason for hiding this comment

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

I agree with you @wking . The only reason this wasn't removed earlier was the clusterfleetevaluation check.
But I think this check can also be removed with the cgroupv1 getting removed from all the ocp>4.19 clusters.
Let me update the commit with those changes as well.

Copy link
Member Author

@sairameshv sairameshv Nov 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Here are the follow-up PRs @wking , Could you help tagging them?

openshift/api#2579
openshift/cluster-node-tuning-operator#1428

@sairameshv
Remove the dead code of setting the operator status for cgroupv1
dd2e67c 
clusters

- Option of configuring cgroupv1 has been removed in OCP - 4.19
- It is safe to remove this check from the operator status for all the clusters greater than OCP - 4.19
- Also removed the cluster fleet evaluation that checks if a cluster is
  configured with cgroupv1

Signed-off-by: Sai Ramesh Vanka <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2025
@sairameshv sairameshv mentioned this pull request Nov 11, 2025
Merged
isabella-janssen
isabella-janssen reviewed Nov 11, 2025
View reviewed changes
Copy link
Member

@isabella-janssen isabella-janssen left a comment

Choose a reason for hiding this comment

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

/approve

This looks like a fair change to me as the OCP docs do indicate that a cluster with cgroup v1 cannot upgrade to 4.19, which makes the removed block of code unnecessary.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 11, 2025
@sairameshv sairameshv changed the title Remove the dead code of setting the operator status for cgroupv1 based clusters OCPNODE-3874: Remove the dead code of setting the operator status for cgroupv1 based clusters Nov 11, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 11, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 11, 2025 •
edited by openshift-ci bot
Loading

@sairameshv: This pull request references OCPNODE-3874 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 spike to target the "4.21.0" version, but no target version was set.

In response to this:

  • Option of configuring cgroupv1 has been removed in OCP - 4.19
  • It is safe to remove this check from the operator status for all the clusters greater than OCP - 4.19

Reference: #5397 (comment)

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.

@sairameshv
Copy link
Member Author

sairameshv commented Nov 11, 2025

/jira refresh

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 11, 2025 •
edited by openshift-ci bot
Loading

@sairameshv: This pull request references OCPNODE-3874 which is a valid jira issue.

In response to this:

/jira refresh

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.

@sairameshv
Copy link
Member Author

sairameshv commented Nov 11, 2025

/retest

@ngopalak-redhat
Copy link
Contributor

ngopalak-redhat commented Nov 11, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: isabella-janssen, ngopalak-redhat, QiWang19, sairameshv

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@sairameshv
Copy link
Member Author

sairameshv commented Nov 11, 2025

/verified

Adding the verified label as I don't think we can test this deleted code.
Api doesn't support setting the value of cgroupMode to "v1" already

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 11, 2025

@sairameshv: The /verified command must be used with one of the following actions: by, later, remove, or bypass. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

In response to this:

/verified

Adding the verified label as I don't think we can test this deleted code.
Api doesn't support setting the value of cgroupMode to "v1" already

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.

@sairameshv
Copy link
Member Author

sairameshv commented Nov 11, 2025

/verified by @sairameshv

Adding the verified label as I don't think we can test this deleted code.
Api doesn't support setting the value of cgroupMode to "v1" already

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 11, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 11, 2025

@sairameshv: This PR has been marked as verified by @sairameshv.

In response to this:

/verified by @sairameshv

Adding the verified label as I don't think we can test this deleted code.
Api doesn't support setting the value of cgroupMode to "v1" already

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.

@isabella-janssen
Copy link
Member

isabella-janssen commented Nov 11, 2025

/label backport-risk-assessed

The tests are passing for this PR so it should be a safe change.

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 11, 2025
@isabella-janssen
Copy link
Member

isabella-janssen commented Nov 11, 2025

/retest-required

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 11, 2025

/retest-required

Remaining retests: 0 against base HEAD 8dc0f4d and 2 for PR HEAD dd2e67c in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 12, 2025

/retest-required

Remaining retests: 0 against base HEAD 5c30302 and 1 for PR HEAD dd2e67c in total

@sergiordlr
Copy link
Contributor

sergiordlr commented Nov 12, 2025

All critical test cases passed https://qe-private-deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gs/qe-private-deck/logs/periodic-ci-o[…]ration-mco-critical-f7/1988305878943535104

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 12, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 12, 2025 •
edited by openshift-ci bot
Loading

@sairameshv: This pull request references OCPNODE-3874 which is a valid jira issue.

In response to this:

  • Option of configuring cgroupv1 has been removed in OCP - 4.19
  • It is safe to remove this check from the operator status for all the clusters greater than OCP - 4.19

Reference: #5397 (comment)

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.

@sairameshv
Copy link
Member Author

sairameshv commented Nov 12, 2025

/retest-required

1 similar comment
@QiWang19
Copy link
Member

QiWang19 commented Nov 12, 2025

/retest-required

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 13, 2025

/retest-required

Remaining retests: 0 against base HEAD 7c04bdb and 0 for PR HEAD dd2e67c in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 13, 2025

/hold

Revision dd2e67c was retested 3 times: holding

@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 Nov 13, 2025
@sairameshv
Copy link
Member Author

sairameshv commented Nov 14, 2025

/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 Nov 14, 2025
@sairameshv
Copy link
Member Author

sairameshv commented Nov 14, 2025

/retest-required

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 14, 2025

/retest-required

Remaining retests: 0 against base HEAD ca0c19d and 2 for PR HEAD dd2e67c in total

@sairameshv
Copy link
Member Author

sairameshv commented Nov 17, 2025

/retest-required

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 17, 2025

/retest-required

Remaining retests: 0 against base HEAD 661e30e and 1 for PR HEAD dd2e67c in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 18, 2025

/retest-required

Remaining retests: 0 against base HEAD b3e3c8a and 0 for PR HEAD dd2e67c in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 18, 2025

/hold

Revision dd2e67c was retested 3 times: holding

@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 Nov 18, 2025
@sairameshv
Copy link
Member Author

sairameshv commented Nov 18, 2025

/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 Nov 18, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 18, 2025

/retest-required

Remaining retests: 0 against base HEAD b3e3c8a and 2 for PR HEAD dd2e67c in total

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 18, 2025

/retest-required

Remaining retests: 0 against base HEAD d151372 and 1 for PR HEAD dd2e67c in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 18, 2025

@sairameshv: all tests passed!

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.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 19, 2025

/retest-required

Remaining retests: 0 against base HEAD b4ea81d and 0 for PR HEAD dd2e67c in total

@openshift-merge-bot openshift-merge-bot bot merged commit b0dc9a5 into openshift:main Nov 19, 2025
9 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wking wking wking left review comments

@cheesesashimi cheesesashimi Awaiting requested review from cheesesashimi

@djoshy djoshy Awaiting requested review from djoshy

+2 more reviewers

@QiWang19 QiWang19 QiWang19 left review comments

@isabella-janssen isabella-janssen isabella-janssen left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@rbbratta rbbratta

@eurijon eurijon

@QiWang19 QiWang19

@lyman9966 lyman9966

@anuragthehatter anuragthehatter

@imatza-rh imatza-rh

@rioliu-rh rioliu-rh

@mhanss mhanss

@ptalgulk01 ptalgulk01

@ngopalak-redhat ngopalak-redhat

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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. qe-approved Signifies that QE has signed off on this PR verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.