Skip to content
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

OCPNODE-2276: Set Upgradeable=False when cluster is on cgroup v1 #4921

Merged
merged 1 commit into from
Mar 19, 2025
Merged

OCPNODE-2276: Set Upgradeable=False when cluster is on cgroup v1 #4921

merged 1 commit into from
Mar 19, 2025

Conversation

sairameshv
Copy link
Member

CgroupMode v1 is not supported in OCP-4.19
This change helps in preventing clusters to upgrade to 4.19 before updating the cluster to cgroupMode v2

This is a cherry-pick of #4822

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

openshift-ci-robot commented Mar 18, 2025 •
edited by openshift-ci bot
Loading

@sairameshv: This pull request references OCPNODE-2276 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 either version "4.18." or "openshift-4.18.", but it targets "openshift-4.19" instead.

In response to this:

CgroupMode v1 is not supported in OCP-4.19
This change helps in preventing clusters to upgrade to 4.19 before updating the cluster to cgroupMode v2

This is a cherry-pick of #4822

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.

@rphillips
Copy link
Contributor

Does this PR prevent customers upgrading to a 4.18.Z version?

@sairameshv
Copy link
Member Author

sairameshv commented Mar 18, 2025 •
edited
Loading

Does this PR prevent customers upgrading to a 4.18.Z version?

@rphillips , When this PR gets merged, We get the 4.18.Z version
Then, I would raise a PR in cincinnati-graph-data repo to have this as a min version of 4.18.

Similar Reference PR: openshift/cincinnati-graph-data#3889

@rphillips
Copy link
Contributor

rphillips commented Mar 18, 2025 •
edited
Loading

Right, will this PR prevent someone from upgrading to a 4.18.Z? ie, 4.18.4 to 4.18.5?

@sairameshv
Copy link
Member Author

Right, but this PR prevent someone from upgrading to a 4.18.Z? ie, 4.18.4 to 4.18.5?

Yes, we are setting the upgradeability of the CO to false.
/hold

Do we have solution for this? i.e. allwoing the 4.18.z upgrades and not the 4.19?
cc: @yuqi-zhang @haircommander

@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 Mar 18, 2025
@yuqi-zhang
Copy link
Contributor

As far as I'm aware, upgradeable=false only applies to minor updates and not z-stream updates, so this should do as intended

@wking
Copy link
Member

wking commented Mar 18, 2025

As far as I'm aware, upgradeable=false only applies to minor updates and not z-stream updates...

Correct. Backing API docs:

When set on ClusterOperator, False will block minor OpenShift updates.

So 4.18 -> 4.18 updates are not impacted by ClusterOperator Upgradeable conditions. See SemVer for MAJOR.MINOR.PATCH to translate "minor OpenShift updates" to "only 4.y -> 4.(y+1)".

@rphillips
Copy link
Contributor

/lgtm
/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 Mar 18, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2025
yuqi-zhang
yuqi-zhang reviewed Mar 18, 2025
View reviewed changes
@sairameshv
Set Upgradeable=False when cluster is on cgroup v1
402b694 
CgroupMode `v1` is not supported in OCP-4.19
This change helps in preventing clusters to upgrade to 4.19 before updating the
cluster to cgroupMode `v2`

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 Mar 19, 2025
@haircommander
Copy link
Member

/lgtm

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

openshift-ci bot commented Mar 19, 2025

@sairameshv: 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/e2e-azure-ovn-upgrade-out-of-change 402b694 link false /test e2e-azure-ovn-upgrade-out-of-change
ci/prow/e2e-gcp-op-techpreview 402b694 link false /test e2e-gcp-op-techpreview

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.

@sairameshv
Copy link
Member Author

/retest-required

@rphillips
Copy link
Contributor

/label backport-risk-assessed

@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 Mar 19, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 19, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, rphillips, sairameshv, yuqi-zhang

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 19, 2025
@mrunalp mrunalp added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Mar 19, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 46eed2b into openshift:release-4.18 Mar 19, 2025
17 of 19 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.18.0-202503191702.p0.g46eed2b.assembly.stream.el9.
All builds following this will include this PR.

@sairameshv sairameshv mentioned this pull request Mar 20, 2025
Merged
@haircommander haircommander mentioned this pull request Mar 20, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@dkhater-redhat dkhater-redhat Awaiting requested review from dkhater-redhat

Assignees

@rphillips rphillips

@rbbratta rbbratta

@eurijon eurijon

@haircommander haircommander

@anuragthehatter anuragthehatter

@sergiordlr sergiordlr

@rlobillo rlobillo

@rioliu-rh rioliu-rh

@mhanss mhanss

@ptalgulk01 ptalgulk01

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.