-
Notifications
You must be signed in to change notification settings - Fork 86
deps: bump runtime-spec to v1.3.0. #243
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.
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
Merged
AkihiroSuda
merged 4 commits into
containerd:main
from
klihub:devel/runtime-spec-v1.3.0
Nov 17, 2025
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
5d5d4c4
go.{mod,sum}: update runtime-tools, runtime-spec to v1.3.0.
klihub 7dd7c7f
api,runtime-tools: adjust for runtime-spec v1.3.0.
klihub d812952
v010-adapter: lock NRI, runtime spec and tools deps.
klihub 29c5811
(v0.1.0) examples: lock NRI, runtime spec deps.
klihub File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,6 +29,11 @@ import ( | |
| nri "github.com/containerd/nri/pkg/api" | ||
| ) | ||
|
|
||
| const ( | ||
| // UnlimitedPidsLimit indicates unlimited Linux PIDs limit. | ||
| UnlimitedPidsLimit = -1 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit todo: define and retrieve from runtime-tools?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess runtime-tools might be eventually going to be deprecated, so this seems fine for now |
||
| ) | ||
|
|
||
| // GeneratorOption is an option for Generator(). | ||
| type GeneratorOption func(*Generator) | ||
|
|
||
|
|
@@ -611,6 +616,21 @@ func (g *Generator) SetProcessIOPriority(ioprio *rspec.LinuxIOPriority) { | |
| g.Config.Process.IOPriority = ioprio | ||
| } | ||
|
|
||
| // SetLinuxResourcesPidsLimit sets Linux PID limit. Starting with | ||
| // v1.3.0 opencontainers/runtime-spec switched the PID limit to | ||
| // *int64 from int64 with nil meaning "unlimited". We don't want | ||
| // to change our API types though, so instead we use a dedicated | ||
| // value for unlimited. | ||
| func (g *Generator) SetLinuxResourcesPidsLimit(limit int64) { | ||
| g.initConfigLinuxResources() | ||
| if g.Config.Linux.Resources.Pids == nil { | ||
| g.Config.Linux.Resources.Pids = &rspec.LinuxPids{} | ||
| } | ||
| if limit > UnlimitedPidsLimit { | ||
| g.Config.Linux.Resources.Pids.Limit = &limit | ||
| } | ||
| } | ||
|
|
||
| func (g *Generator) initConfig() { | ||
| if g.Config == nil { | ||
| g.Config = &rspec.Spec{} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit // runtime-tools has not tagged a release in six years have to move up to commit to resolve __