Fix no pivot and keyring opts

crosbymichael · crosbymichael · commit 160737d2c803 · 2019-03-06T12:37:36.000-05:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/container.go b/container.go
@@ -229,7 +229,9 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N
 			})
 		}
 	}
-	var info TaskInfo
+	info := TaskInfo{
+		runtime: r.Runtime.Name,
+	}
 	for _, o := range opts {
 		if err := o(ctx, c.client, &info); err != nil {
 			return nil, err
diff --git a/container_checkpoint_test.go b/container_checkpoint_test.go
@@ -485,7 +485,7 @@ func TestCRWithImagePath(t *testing.T) {
 	}
 	defer ncontainer.Delete(ctx, WithSnapshotCleanup)
 
-	ntask, err := ncontainer.NewTask(ctx, empty(), WithRestoreImagePath(client.runtime, imagePath))
+	ntask, err := ncontainer.NewTask(ctx, empty(), WithRestoreImagePath(imagePath))
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/task.go b/task.go
@@ -43,7 +43,7 @@ import (
 	google_protobuf "github.com/gogo/protobuf/types"
 	digest "github.com/opencontainers/go-digest"
 	is "github.com/opencontainers/image-spec/specs-go"
-	"github.com/opencontainers/image-spec/specs-go/v1"
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
 )
@@ -131,6 +131,12 @@ type TaskInfo struct {
 	RootFS []mount.Mount
 	// Options hold runtime specific settings for task creation
 	Options interface{}
+	runtime string
+}
+
+// Runtime name for the container
+func (i *TaskInfo) Runtime() string {
+	return i.runtime
 }
 
 // Task is the executable object within containerd
diff --git a/task_opts.go b/task_opts.go
@@ -118,9 +118,9 @@ func WithCheckpointImagePath(rt, path string) CheckpointTaskOpts {
 }
 
 // WithRestoreImagePath sets image path for create option
-func WithRestoreImagePath(rt, path string) NewTaskOpts {
+func WithRestoreImagePath(path string) NewTaskOpts {
 	return func(ctx context.Context, c *Client, ti *TaskInfo) error {
-		if CheckRuntime(rt, "io.containerd.runc") {
+		if CheckRuntime(ti.Runtime(), "io.containerd.runc") {
 			if ti.Options == nil {
 				ti.Options = &options.Options{}
 			}
diff --git a/task_opts_unix.go b/task_opts_unix.go
@@ -22,36 +22,58 @@ import (
 	"context"
 
 	"github.com/containerd/containerd/runtime/linux/runctypes"
+	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/pkg/errors"
 )
 
 // WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage.
 // There is an upper limit on the number of keyrings in a linux system
 func WithNoNewKeyring(ctx context.Context, c *Client, ti *TaskInfo) error {
-	if ti.Options == nil {
-		ti.Options = &runctypes.CreateOptions{}
-	}
-	opts, ok := ti.Options.(*runctypes.CreateOptions)
-	if !ok {
-		return errors.New("could not cast TaskInfo Options to CreateOptions")
+	if CheckRuntime(ti.Runtime(), "io.containerd.runc") {
+		if ti.Options == nil {
+			ti.Options = &options.Options{}
+		}
+		opts, ok := ti.Options.(*options.Options)
+		if !ok {
+			return errors.New("invalid v2 shim create options format")
+		}
+		opts.NoNewKeyring = true
+	} else {
+		if ti.Options == nil {
+			ti.Options = &runctypes.CreateOptions{}
+		}
+		opts, ok := ti.Options.(*runctypes.CreateOptions)
+		if !ok {
+			return errors.New("could not cast TaskInfo Options to CreateOptions")
+		}
+		opts.NoNewKeyring = true
 	}
-
-	opts.NoNewKeyring = true
 	return nil
 }
 
 // WithNoPivotRoot instructs the runtime not to you pivot_root
-func WithNoPivotRoot(_ context.Context, _ *Client, info *TaskInfo) error {
-	if info.Options == nil {
-		info.Options = &runctypes.CreateOptions{
-			NoPivotRoot: true,
+func WithNoPivotRoot(_ context.Context, _ *Client, ti *TaskInfo) error {
+	if CheckRuntime(ti.Runtime(), "io.containerd.runc") {
+		if ti.Options == nil {
+			ti.Options = &options.Options{}
 		}
-		return nil
-	}
-	opts, ok := info.Options.(*runctypes.CreateOptions)
-	if !ok {
-		return errors.New("invalid options type, expected runctypes.CreateOptions")
+		opts, ok := ti.Options.(*options.Options)
+		if !ok {
+			return errors.New("invalid v2 shim create options format")
+		}
+		opts.NoPivotRoot = true
+	} else {
+		if ti.Options == nil {
+			ti.Options = &runctypes.CreateOptions{
+				NoPivotRoot: true,
+			}
+			return nil
+		}
+		opts, ok := ti.Options.(*runctypes.CreateOptions)
+		if !ok {
+			return errors.New("invalid options type, expected runctypes.CreateOptions")
+		}
+		opts.NoPivotRoot = true
 	}
-	opts.NoPivotRoot = true
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,9 @@ func (c *container) NewTask(ctx context.Context, ioCreate cio.Creator, opts ...N`
`229`	`229`	`})`
`230`	`230`	`}`
`231`	`231`	`}`
`232`		`- var info TaskInfo`
	`232`	`+ info := TaskInfo{`
	`233`	`+ runtime: r.Runtime.Name,`
	`234`	`+ }`
`233`	`235`	`for _, o := range opts {`
`234`	`236`	`if err := o(ctx, c.client, &info); err != nil {`
`235`	`237`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ func TestCRWithImagePath(t *testing.T) {`
`485`	`485`	`}`
`486`	`486`	`defer ncontainer.Delete(ctx, WithSnapshotCleanup)`
`487`	`487`
`488`		`- ntask, err := ncontainer.NewTask(ctx, empty(), WithRestoreImagePath(client.runtime, imagePath))`
	`488`	`+ ntask, err := ncontainer.NewTask(ctx, empty(), WithRestoreImagePath(imagePath))`
`489`	`489`	`if err != nil {`
`490`	`490`	`t.Fatal(err)`
`491`	`491`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,9 @@ func WithCheckpointImagePath(rt, path string) CheckpointTaskOpts {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// WithRestoreImagePath sets image path for create option`
`121`		`-func WithRestoreImagePath(rt, path string) NewTaskOpts {`
	`121`	`+func WithRestoreImagePath(path string) NewTaskOpts {`
`122`	`122`	`return func(ctx context.Context, c Client, ti TaskInfo) error {`
`123`		`- if CheckRuntime(rt, "io.containerd.runc") {`
	`123`	`+ if CheckRuntime(ti.Runtime(), "io.containerd.runc") {`
`124`	`124`	`if ti.Options == nil {`
`125`	`125`	`ti.Options = &options.Options{}`
`126`	`126`	`}`