Cleanup shim manager configuration #10243
Open
+59
−37
Conversation
This file contains 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
dmcgowan
force-pushed
the
update-shim-manager-config
branch
2 times, most recently
from
389e06d
to
28bc851
Compare
mxpv
approved these changes
May 18, 2024
core/runtime/v2/shim_manager.go
Outdated
| switch vv := v.(type) { | ||
| case bool: | ||
| schedCore = vv | ||
| case string: |
There was a problem hiding this comment.
If sched_core is not a boolean type, containerd can not run in v1.7.12 and v2.0.0-rc.2. Do we need to handle the situation where sched_core is not a boolean type?
version = 2
[plugins."io.containerd.runtime.v2.task"]
platforms = ["linux/amd64"]
sched_core = "true"- containerd v1.7.12
containerd: (4, 3): Can't convert true(string) to bool
- containerd v2.0.0-rc.2
containerd: toml: cannot decode TOML string into struct field v2.Config.SchedCore of type bool
There was a problem hiding this comment.
Good point, thanks for checking on this. I simplified to just check for boolean and warn if not boolean.
dmcgowan
force-pushed
the
update-shim-manager-config
branch
from
28bc851
to
40d4466
Compare
Keep platforms configuration on task manager and add environment config for shims. Signed-off-by: Derek McGowan <derek@mcg.dev>
dmcgowan
force-pushed
the
update-shim-manager-config
branch
from
40d4466
to
ca59fb0
Compare
mikebrow
reviewed
May 22, 2024
|
LGTM |
AkihiroSuda
approved these changes
Jun 2, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Keep platforms configuration on task manager and add environment config for shims. The
sched_coreconfig is very runtime specific and does not need to be a top level configuration, rather just being able to add environment variables is much more useful. Renamed the shim manager plugin toio.containerd.shim.v1.managerrather thanio.containerd.shim.v1.shim, which was a recent change after config version 2.ctr plugins lsnow shows