[release/1.3] fix NoPivot for RuntimeRuncV2

AkihiroSuda · AkihiroSuda · commit 6381713164fb · 2019-12-18T12:09:02.000+09:00
Partially cherry-pick aaddaa2 (#1359) #1359 (comment) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
diff --git a/pkg/server/sandbox_run.go b/pkg/server/sandbox_run.go
@@ -271,7 +271,7 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
 
 	var taskOpts []containerd.NewTaskOpts
 	// TODO(random-liu): Remove this after shim v1 is deprecated.
-	if c.config.NoPivot && ociRuntime.Type == plugin.RuntimeRuncV1 {
+	if c.config.NoPivot && (ociRuntime.Type == plugin.RuntimeRuncV1 || ociRuntime.Type == plugin.RuntimeRuncV2) {
 		taskOpts = append(taskOpts, containerd.WithNoPivotRoot)
 	}
 	// We don't need stdio for sandbox container.

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ func (c criService) RunPodSandbox(ctx context.Context, r runtime.RunPodSandbox`
`271`	`271`
`272`	`272`	`var taskOpts []containerd.NewTaskOpts`
`273`	`273`	`// TODO(random-liu): Remove this after shim v1 is deprecated.`
`274`		`- if c.config.NoPivot && ociRuntime.Type == plugin.RuntimeRuncV1 {`
	`274`	`+ if c.config.NoPivot && (ociRuntime.Type == plugin.RuntimeRuncV1 \|\| ociRuntime.Type == plugin.RuntimeRuncV2) {`
`275`	`275`	`taskOpts = append(taskOpts, containerd.WithNoPivotRoot)`
`276`	`276`	`}`
`277`	`277`	`// We don't need stdio for sandbox container.`