fix(containerd): avoid duplicate runsc runtime when defined in contai…#13131
fix(containerd): avoid duplicate runsc runtime when defined in contai…#13131pando85 wants to merge 1 commit intokubernetes-sigs:masterfrom
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: pando85 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Hi @pando85. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
e29314c to
5f8d46a
Compare
There was a problem hiding this comment.
Quick addendum: the earlier comment was a bit long — tl;dr: fix looks good. Please add a release-note block (bot label), and align the PR description with the current diff (the runtime_engine/runtime_root optional change is not in the patch anymore).
/ok-to-test
…nerd_additional_runtimes When both gvisor_enabled=true and runsc is defined in containerd_additional_runtimes, containerd config would have duplicate [plugins.*.runtimes.runsc] sections causing containerd to fail. Users often define runsc in containerd_additional_runtimes to customize options (TypeUrl, ConfigPath) while still needing gvisor_enabled=true to trigger binary installation. Fix by checking if runsc is already in containerd_additional_runtimes before adding the default gvisor block.
5f8d46a to
93cac25
Compare
|
@yankay, thanks for your fast review. I fixed the commit message and the original commit. Although I don't know how to add the release-note label. /release-note |
|
@pando85: the DetailsIn 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 kubernetes-sigs/prow repository. |
|
@yankay ok, found it! |
|
@yankay anything else to do from my side? |
…nerd_additional_runtimes
What type of PR is this?
/kind bug
What this PR does / why we need it:
When both
gvisor_enabled=trueandrunscis defined incontainerd_additional_runtimes, containerd config would have duplicate[plugins.*.runtimes.runsc]sections causing containerd to fail.Users often define runsc in containerd_additional_runtimes to customize options (TypeUrl, ConfigPath) while still needing gvisor_enabled=true to trigger binary installation.
Fix by checking if runsc is already in containerd_additional_runtimes before adding the default gvisor block.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?:
NONE