Skip to content

fix(containerd): avoid duplicate runsc runtime when defined in contai…#13131

Open
pando85 wants to merge 1 commit intokubernetes-sigs:masterfrom
pando85:fix-duplicate-runsc-runtime
Open

fix(containerd): avoid duplicate runsc runtime when defined in contai…#13131
pando85 wants to merge 1 commit intokubernetes-sigs:masterfrom
pando85:fix-duplicate-runsc-runtime

Conversation

@pando85
Copy link
Copy Markdown
Contributor

@pando85 pando85 commented Mar 29, 2026

…nerd_additional_runtimes

What type of PR is this?
/kind bug

What this PR does / why we need it:

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.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:
NONE

Fix to avoid duplicate runsc runtime when defined in containerd_additional_runtimes

@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Mar 29, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pando85
Once this PR has been reviewed and has the lgtm label, please assign vannten for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 29, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 29, 2026
@pando85 pando85 force-pushed the fix-duplicate-runsc-runtime branch from e29314c to 5f8d46a Compare March 29, 2026 16:14
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 29, 2026
Copy link
Copy Markdown
Member

@yankay yankay left a comment

Choose a reason for hiding this comment

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

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

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 31, 2026
…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.
@pando85 pando85 force-pushed the fix-duplicate-runsc-runtime branch from 5f8d46a to 93cac25 Compare March 31, 2026 06:30
@pando85
Copy link
Copy Markdown
Contributor Author

pando85 commented Mar 31, 2026

@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

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@pando85: the /release-note and /release-note-action-required commands have been deprecated.
Please edit the release-note block in the PR body text to include the release note. If the release note requires additional action include the string action required in the release note. For example:

```release-note
Some release note with action required.
```
Details

In response to this:

@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

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.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 31, 2026
@pando85
Copy link
Copy Markdown
Contributor Author

pando85 commented Mar 31, 2026

@yankay ok, found it!

@pando85
Copy link
Copy Markdown
Contributor Author

pando85 commented Apr 8, 2026

@yankay anything else to do from my side?

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

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants