OKD-294: Migrate runtime from runc to crun on an upgrade for OKD #5389
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@Prashanth684: This pull request references OKD-294 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.21.0" version, but no target version was set. In response to this:
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. |
|
@Prashanth684: This pull request references OKD-294 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.21.0" version, but no target version was set. In response to this:
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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Prashanth684 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Prashanth684
force-pushed
the
mco-crun
branch
2 times, most recently
from
493b483 to
2c63371
Compare
|
/test bootstrap-unit |
|
/test okd-scos-e2e-aws-ovn |
Prashanth684
force-pushed
the
mco-crun
branch
from
2c63371 to
7700e81
Compare
|
/retest-required |
| // Only process master and worker pools for the migration | ||
| for _, pool := range pools { | ||
| if pool.Name != ctrlcommon.MachineConfigPoolMaster && pool.Name != ctrlcommon.MachineConfigPoolWorker { | ||
| continue | ||
| } |
There was a problem hiding this comment.
From the context in #4635 (comment), I'm gathering that the intention is to only target default MCPs. What about the arbiter MCP? Should it also be included in this list of default MCPs?
machine-config-operator/pkg/controller/common/constants.go
Lines 66 to 67 in a1ac217
cc @yuqi-zhang Since it looks like you had the original suggestion to scope to default MCPs.
There was a problem hiding this comment.
@yuqi-zhang do we need to consider the arbiter here? or are we good with the changes as is?
There was a problem hiding this comment.
I think arbiter probably isn't relevant here, since 2-node-with-fencing is not yet GA'ed and even if it was, I don't think there would be any OKD overlap with it atm for upgrades, so we should be good.
So basically this is "forcing" any OKD clusters to use crun since runc is gone on upgrades, is installs still possible for runc if you set it (and is there a guard against it if so, I forget if we deprecated it)? Is RHEL10 also dropping runc? Maybe we need this generally speaking cc @sdodson
There was a problem hiding this comment.
Yes, RHEL10 dropped runc but AFAIK the plan is to start building it for OCP as we're hesitant to drop runc until crun sees more adoption even if crun is the default since 4.18.
| // Only process master and worker pools for the migration | ||
| for _, pool := range pools { | ||
| if pool.Name != ctrlcommon.MachineConfigPoolMaster && pool.Name != ctrlcommon.MachineConfigPoolWorker { | ||
| continue | ||
| } |
There was a problem hiding this comment.
I think arbiter probably isn't relevant here, since 2-node-with-fencing is not yet GA'ed and even if it was, I don't think there would be any OKD overlap with it atm for upgrades, so we should be good.
So basically this is "forcing" any OKD clusters to use crun since runc is gone on upgrades, is installs still possible for runc if you set it (and is there a guard against it if so, I forget if we deprecated it)? Is RHEL10 also dropping runc? Maybe we need this generally speaking cc @sdodson
pkg/controller/container-runtime-config/container_runtime_config_controller.go
Show resolved
Hide resolved
|
|
||
| ctrl.clusterVersionLister = clusterVersionInformer.Lister() | ||
| ctrl.clusterVersionListerSynced = clusterVersionInformer.Informer().HasSynced | ||
| ctrl.queue.Add(forceSyncOnUpgrade) |
There was a problem hiding this comment.
Have you observed this to be necessary? The new controller is expected to re-gen all the MCs so it should always be synced post-new controller deployment
There was a problem hiding this comment.
yes - i noticed that before i added this, the upgrade to an image with these changes did not change the MC at all.
pkg/controller/container-runtime-config/container_runtime_config_controller.go
Outdated
Show resolved
Hide resolved
Prashanth684
force-pushed
the
mco-crun
branch
from
7700e81 to
e601997
Compare
|
changed to delete the MC rather than editing it. @yuqi-zhang if you could look over and give a final approval, that'd be great |
Centos stream 10 dopped the runc package. For now OKD users are following the workaround to edit the MC to point to crun before the upgrade, but this should help with the migration rather than having to intervene manually. This PR: - checks for presence of the configmap - if MCO is built for OKD, edit the MC so the runtime is crun. - deletes the configmap
Prashanth684
force-pushed
the
mco-crun
branch
from
e601997 to
8b3391f
Compare
|
@Prashanth684: The following tests failed, say
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. |
5 participants
Centos stream 10 dopped the runc package. For now OKD users are following the workaround to edit the MC to point to crun before the upgrade, but this should help with the migration rather than having to intervene manually.
This PR:
Borrows from the implementation here: #4635