github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[sandbox] Specify sandbox ID when using sandboxed shims

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2022-11-28 13:27:54 -08:00
parent 9a53a6c34a
commit dbc6d33ac5
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cri/sbserver/container_create.go
View File

@@ -252,6 +252,11 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
containerd.WithContainerExtension(containerMetadataExtension, &meta), containerd.WithContainerExtension(containerMetadataExtension, &meta),
) )
// When using sandboxed shims, containerd's runtime needs to know which sandbox shim instance to use.
if ociRuntime.SandboxMode == string(criconfig.ModeShim) {
opts = append(opts, containerd.WithSandbox(sandboxID))
}
var cntr containerd.Container var cntr containerd.Container
if cntr, err = c.client.NewContainer(ctx, id, opts...); err != nil { if cntr, err = c.client.NewContainer(ctx, id, opts...); err != nil {
return nil, fmt.Errorf("failed to create containerd container: %w", err) return nil, fmt.Errorf("failed to create containerd container: %w", err)

11
pkg/cri/sbserver/sandbox_run.go
View File

@@ -257,12 +257,15 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
} }
return nil, fmt.Errorf("failed to start sandbox %q: %w", id, err) return nil, fmt.Errorf("failed to start sandbox %q: %w", id, err)
} }
// TODO: get rid of this. sandbox object should no longer have Container field. // TODO: get rid of this. sandbox object should no longer have Container field.
container, err := c.client.LoadContainer(ctx, id) if ociRuntime.SandboxMode == string(criconfig.ModePodSandbox) {
if err != nil { container, err := c.client.LoadContainer(ctx, id)
return nil, fmt.Errorf("failed to load container %q for sandbox: %w", id, err) if err != nil {
return nil, fmt.Errorf("failed to load container %q for sandbox: %w", id, err)
}
sandbox.Container = container
} }
sandbox.Container = container
labels := resp.GetLabels() labels := resp.GetLabels()
if labels == nil { if labels == nil {