Merge pull request containerd#9861 from mxpv/pause

estesp · web-flow · commit 74dd6e6f3f6b · 2024-02-23T19:26:27.000Z
Remove pause package from runc shim
diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go
@@ -22,7 +22,6 @@ import (
 	"context"
 
 	"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"
-	_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"
 	_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin"
 	"github.com/containerd/containerd/v2/core/runtime/v2/shim"
 )
diff --git a/cmd/containerd-shim-runc-v2/pause/sandbox.go b/cmd/containerd-shim-runc-v2/pause/sandbox.go
diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go
@@ -20,7 +20,6 @@ import (
 	"context"
 
 	"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"
-	_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"
 	"github.com/containerd/containerd/v2/core/runtime/v2/shim"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ import (`
`22`	`22`	`"context"`
`23`	`23`
`24`	`24`	`"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"`
`25`		`- _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"`
`26`	`25`	`_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin"`
`27`	`26`	`"github.com/containerd/containerd/v2/core/runtime/v2/shim"`
`28`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`	`"context"`
`21`	`21`
`22`	`22`	`"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"`
`23`		`- _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"`
`24`	`23`	`"github.com/containerd/containerd/v2/core/runtime/v2/shim"`
`25`	`24`	`)`
`26`	`25`