-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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
sandbox: make an independent shim plugin #9853
Conversation
Hi @abel-von. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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/test-infra repository. |
c5b85d5
to
bd6caa5
Compare
/ok-to-test |
bd6caa5
to
a89fe4d
Compare
a89fe4d
to
5439913
Compare
5439913
to
960a06b
Compare
@@ -186,17 +158,7 @@ func (m *ShimManager) ID() string { | |||
} |
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.
ID should return plugins.ShimPlugin.String() + .shim
?
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.
done
func init() { | ||
registry.Register(&plugin.Registration{ | ||
Type: plugins.RuntimePluginV2, | ||
ID: "task", |
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.
The shim plugin will migrate for this type in shim_manager.go. Is it conflicted?
const originalPluginName = string(plugins.RuntimePluginV2) + ".task"
original, ok := pluginConfigs[originalPluginName]
if !ok {
return nil
}
const newPluginName = string(plugins.ShimPlugin) + ".shim"
pluginConfigs[originalPluginName] = nil
pluginConfigs[newPluginName] = original
return nil
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.
We do migration only for the config file of configVersion < 3, and the in the newest config file, shim configs should be defined under io.containerd.shim.v1.shim and we won't migrate them from io.containerd.runtime.v2.task anymore. some comments are added to illustrate that.
960a06b
to
ad0f706
Compare
/retest |
1 similar comment
/retest |
/retest |
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.
LGTM just minor naming / code doc nits..
The naming of parameters alternates from state/root with no description ... to stateDir/rootDir and then is described and used as a path
name with join/extension for specific files. Maybe some normalization to the form stateDir and a couple lines of doc.
Signed-off-by: Abel Feng <fshb1988@gmail.com>
ad0f706
to
a12aced
Compare
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.
LGTM
/test pull-containerd-node-e2e |
1 similar comment
/test pull-containerd-node-e2e |
Currently, The Shim and Task plugin is mixed into a core/runtime/v2/manager.go, In this PR, we split the Shim plugin to make it an independent plugin.
This is the second PR of the sandboxed Task demonstrated in draft #9574