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

ctr sandbox: handle sandbox config

Browse Source 
"ctr s r" help suggests <pod-config.json> is taken as the first
parameter and the sandbox ID becomes next. However, only the latter
is read and used.

Add code that reads <pod-config.json> and passes it to Sanbox.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
This commit is contained in:
Mikko Ylinen 2022-05-19 15:26:11 +03:00
parent 405fba75dd
commit 900019b301
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/ctr/commands/sandboxes/sandboxes.go
View File

@ -17,6 +17,7 @@
package sandboxes
import (
"encoding/json"
"fmt"
"os"
"text/tabwriter"
@ -54,11 +55,24 @@ var runCommand = cli.Command{
},
},
Action: func(context *cli.Context) error {
if context.NArg() != 2 {
return cli.ShowSubcommandHelp(context)
}
var (
id = context.Args().Get(0)
id = context.Args().Get(1)
runtime = context.String("runtime")
)
spec, err := os.ReadFile(context.Args().First())
if err != nil {
return fmt.Errorf("Failed to read sandbox config: %w", err)
}
ociSpec := oci.Spec{}
if err = json.Unmarshal(spec, &ociSpec); err != nil {
return fmt.Errorf("Failed to parse sandbox config: %w", err)
}
client, ctx, cancel, err := commands.NewClient(context)
if err != nil {
return err
@ -67,7 +81,7 @@ var runCommand = cli.Command{
sandbox, err := client.NewSandbox(ctx, id,
containerd.WithSandboxRuntime(runtime, nil),
containerd.WithSandboxSpec(&oci.Spec{}),
containerd.WithSandboxSpec(&ociSpec),
)
if err != nil {
return fmt.Errorf("failed to create new sandbox: %w", err)