diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index 7cca02c98..c77dbcfc1 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - apitask "github.com/containerd/containerd/api/runtime/task/v2" + apitask "github.com/containerd/containerd/api/runtime/task/v3" "github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime/v2/shim" @@ -111,7 +111,7 @@ func TestIssue7496(t *testing.T) { // example, umount overlayfs rootfs which doesn't with volatile. // // REF: https://man7.org/linux/man-pages/man1/strace.1.html -func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.TaskService, delayInSec int) chan struct{} { +func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.TTRPCTaskService, delayInSec int) chan struct{} { pid := shimPid(ctx, t, shimCli) doneCh := make(chan struct{}) @@ -153,7 +153,7 @@ func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.Tas return doneCh } -func connectToShim(ctx context.Context, t *testing.T, id string) apitask.TaskService { +func connectToShim(ctx context.Context, t *testing.T, id string) apitask.TTRPCTaskService { addr, err := shim.SocketAddress(ctx, containerdEndpoint, id) require.NoError(t, err) addr = strings.TrimPrefix(addr, "unix://") @@ -162,10 +162,10 @@ func connectToShim(ctx context.Context, t *testing.T, id string) apitask.TaskSer require.NoError(t, err) client := ttrpc.NewClient(conn) - return apitask.NewTaskClient(client) + return apitask.NewTTRPCTaskClient(client) } -func shimPid(ctx context.Context, t *testing.T, shimCli apitask.TaskService) uint32 { +func shimPid(ctx context.Context, t *testing.T, shimCli apitask.TTRPCTaskService) uint32 { resp, err := shimCli.Connect(ctx, &apitask.ConnectRequest{}) require.NoError(t, err) return resp.GetShimPid() diff --git a/integration/issue7496_shutdown_linux_test.go b/integration/issue7496_shutdown_linux_test.go index e9e1cdc58..70ade7e41 100644 --- a/integration/issue7496_shutdown_linux_test.go +++ b/integration/issue7496_shutdown_linux_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - apitask "github.com/containerd/containerd/api/runtime/task/v2" + apitask "github.com/containerd/containerd/api/runtime/task/v3" "github.com/containerd/containerd/namespaces" ) diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index ef7f9d38f..0a4e6ab75 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -30,7 +30,7 @@ import ( "runtime/debug" "time" - shimapi "github.com/containerd/containerd/api/runtime/task/v2" + shimapi "github.com/containerd/containerd/api/runtime/task/v3" "github.com/containerd/containerd/events" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/pkg/shutdown"