Move runtime v2 proto

Move runtime v2 protos to api/runtime package.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

runtime/v2/binary.go

@@ -26,13 +26,13 @@ import (
 	gruntime "runtime"
 	"strings"
 
+	"github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime"
 	client "github.com/containerd/containerd/runtime/v2/shim"
-	"github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/ttrpc"
 	"github.com/sirupsen/logrus"
 )

runtime/v2/example/example.go

@@ -23,10 +23,10 @@ import (
 	"context"
 	"os"
 
+	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/errdefs"
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime/v2/shim"
-	taskAPI "github.com/containerd/containerd/runtime/v2/task"
 )
 
 var (

runtime/v2/manager.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/containers"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events/exchange"
@@ -37,7 +38,6 @@ import (
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/runtime"
 	shimbinary "github.com/containerd/containerd/runtime/v2/shim"
-	"github.com/containerd/containerd/runtime/v2/task"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 

runtime/v2/process.go

@@ -20,11 +20,11 @@ import (
 	"context"
 	"errors"
 
+	"github.com/containerd/containerd/api/runtime/task/v2"
 	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/runtime"
-	"github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/ttrpc"
 )
 

runtime/v2/runc/container.go

@@ -30,13 +30,13 @@ import (
 	"github.com/containerd/cgroups"
 	cgroupsv2 "github.com/containerd/cgroups/v2"
 	"github.com/containerd/console"
+	"github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/process"
 	"github.com/containerd/containerd/pkg/stdio"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
-	"github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/typeurl"
 	"github.com/sirupsen/logrus"
 )

runtime/v2/runc/pause/sandbox.go

@@ -26,8 +26,8 @@ import (
 	"github.com/containerd/ttrpc"
 	log "github.com/sirupsen/logrus"
 
+	api "github.com/containerd/containerd/api/runtime/sandbox/v1"
 	"github.com/containerd/containerd/plugin"
-	api "github.com/containerd/containerd/runtime/v2/task"
 )
 
 func init() {

runtime/v2/runc/task/service.go

@@ -28,6 +28,7 @@ import (
 	"github.com/containerd/cgroups"
 	cgroupsv2 "github.com/containerd/cgroups/v2"
 	eventstypes "github.com/containerd/containerd/api/events"
+	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
@@ -43,8 +44,6 @@ import (
 	"github.com/containerd/containerd/runtime/v2/runc"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/containerd/runtime/v2/shim"
-	shimapi "github.com/containerd/containerd/runtime/v2/task"
-	taskAPI "github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/containerd/sys/reaper"
 	runcC "github.com/containerd/go-runc"
 	"github.com/containerd/ttrpc"
@@ -147,7 +146,7 @@ func (s *service) Create(ctx context.Context, r *taskAPI.CreateTaskRequest) (_ *
 }
 
 func (s *service) RegisterTTRPC(server *ttrpc.Server) error {
-	shimapi.RegisterTaskService(server, s)
+	taskAPI.RegisterTaskService(server, s)
 	return nil
 }
 

runtime/v2/runc/v1/service.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/containerd/cgroups"
 	eventstypes "github.com/containerd/containerd/api/events"
+	taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/mount"
@@ -47,7 +48,6 @@ import (
 	"github.com/containerd/containerd/runtime/v2/runc"
 	"github.com/containerd/containerd/runtime/v2/runc/options"
 	"github.com/containerd/containerd/runtime/v2/shim"
-	taskAPI "github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/containerd/sys/reaper"
 	runcC "github.com/containerd/go-runc"
 	"github.com/containerd/typeurl"

runtime/v2/runc/v2/service.go

@@ -22,12 +22,12 @@ package v2
 import (
 	"context"
 
+	shimapi "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/pkg/shutdown"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/runtime/v2/runc/manager"
 	"github.com/containerd/containerd/runtime/v2/runc/task"
 	"github.com/containerd/containerd/runtime/v2/shim"
-	shimapi "github.com/containerd/containerd/runtime/v2/task"
 )
 
 // TODO(2.0): Remove this package

runtime/v2/shim.go

@@ -26,6 +26,7 @@ import (
 	"time"
 
 	eventstypes "github.com/containerd/containerd/api/events"
+	"github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/api/types"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events/exchange"
@@ -37,7 +38,6 @@ import (
 	ptypes "github.com/containerd/containerd/protobuf/types"
 	"github.com/containerd/containerd/runtime"
 	client "github.com/containerd/containerd/runtime/v2/shim"
-	"github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/ttrpc"
 	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"

runtime/v2/shim/shim.go

@@ -29,6 +29,7 @@ import (
 	"strings"
 	"time"
 
+	shimapi "github.com/containerd/containerd/api/runtime/task/v2"
 	"github.com/containerd/containerd/events"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/namespaces"
@@ -36,7 +37,6 @@ import (
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/containerd/protobuf/proto"
-	shimapi "github.com/containerd/containerd/runtime/v2/task"
 	"github.com/containerd/containerd/version"
 	"github.com/containerd/ttrpc"
 	"github.com/sirupsen/logrus"

runtime/v2/task/doc.go

@@ -1,17 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package task

runtime/v2/task/sandbox.proto

@@ -1,121 +0,0 @@
-/*
-	Copyright The containerd Authors.
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-syntax = "proto3";
-
-package containerd.task.v2;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/timestamp.proto";
-import weak "gogoproto/gogo.proto";
-
-import "github.com/containerd/containerd/api/types/mount.proto";
-
-// Sandbox is an optional interface that shim may implement to support sandboxes environments.
-// A typical example of sandbox is microVM or pause container - an entity that groups containers and/or
-// holds resources relevant for this group.
-service Sandbox {
-	// StartSandbox will create/start a new sandbox instance
-	rpc StartSandbox(StartSandboxRequest) returns (StartSandboxResponse);
-
-	// StopSandbox will stop existing sandbox instance
-	rpc StopSandbox(StopSandboxRequest) returns (StopSandboxResponse);
-
-	// WaitSandbox blocks until sanbox exits.
-	rpc WaitSandbox(WaitSandboxRequest) returns (WaitSandboxResponse);
-
-	// Update can be used to amend the state of currently running sandbox instance (depending on
-	// implementation this can be used to resize/reacquire needed resources like RAM/CPU).
-	rpc UpdateSandbox(UpdateSandboxRequest) returns (UpdateSandboxResponse);
-
-	// PauseSandbox will suspend currently running sandbox instance.
-	rpc PauseSandbox(PauseSandboxRequest) returns (PauseSandboxResponse);
-
-	// ResumeSandbox will resuyme previously suspended sandbox instance.
-	rpc ResumeSandbox(ResumeSandboxRequest) returns (ResumeSandboxResponse);
-
-	// SandboxStatus will return current status of the running sandbox instance
-	rpc SandboxStatus(SandboxStatusRequest) returns (SandboxStatusResponse);
-
-	// PingSandbox is a lightweight API call to check whether sandbox alive.
-	rpc PingSandbox(PingRequest) returns (PingResponse);
-}
-
-message StartSandboxRequest {
-	string sandbox_id = 1;
-	string bundle_path = 2;
-	repeated containerd.types.Mount rootfs = 3;
-	google.protobuf.Any options = 4;
-}
-
-message StartSandboxResponse {
-	uint32 pid = 1;
-}
-
-message StopSandboxRequest {
-	string sandbox_id = 1;
-	uint32 timeout_secs = 2;
-}
-
-message StopSandboxResponse {}
-
-message UpdateSandboxRequest {
-	string sandbox_id = 1;
-	google.protobuf.Any resources = 2;
-	map<string, string> annotations = 3;
-}
-
-message WaitSandboxRequest {
-	string sandbox_id = 1;
-}
-
-message WaitSandboxResponse {
-	uint32 exit_status = 1;
-	google.protobuf.Timestamp exited_at = 2;
-}
-
-message UpdateSandboxResponse {}
-
-message SandboxStatusRequest {
-	string sandbox_id = 1;
-}
-
-message PauseSandboxRequest {
-	string sandbox_id = 1;
-}
-
-message PauseSandboxResponse {}
-
-message ResumeSandboxRequest {
-	string sandbox_id = 1;
-}
-
-message ResumeSandboxResponse {}
-
-message SandboxStatusResponse {
-	string id = 1;
-	uint32 pid = 2;
-	string state = 3;
-	uint32 exit_status = 4;
-	google.protobuf.Timestamp exited_at = 5;
-	google.protobuf.Any extra = 6;
-}
-
-message PingRequest {
-	string sandbox_id = 1;
-}
-
-message PingResponse {}

runtime/v2/task/shim.proto

@@ -1,202 +0,0 @@
-/*
-	Copyright The containerd Authors.
-
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0
-
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-syntax = "proto3";
-
-package containerd.task.v2;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/empty.proto";
-import "gogoproto/gogo.proto";
-import "google/protobuf/timestamp.proto";
-import "github.com/containerd/containerd/api/types/mount.proto";
-import "github.com/containerd/containerd/api/types/task/task.proto";
-
-option go_package = "github.com/containerd/containerd/runtime/v2/task;task";
-
-// Shim service is launched for each container and is responsible for owning the IO
-// for the container and its additional processes.  The shim is also the parent of
-// each container and allows reattaching to the IO and receiving the exit status
-// for the container processes.
-service Task {
-	rpc State(StateRequest) returns (StateResponse);
-	rpc Create(CreateTaskRequest) returns (CreateTaskResponse);
-	rpc Start(StartRequest) returns (StartResponse);
-	rpc Delete(DeleteRequest) returns (DeleteResponse);
-	rpc Pids(PidsRequest) returns (PidsResponse);
-	rpc Pause(PauseRequest) returns (google.protobuf.Empty);
-	rpc Resume(ResumeRequest) returns (google.protobuf.Empty);
-	rpc Checkpoint(CheckpointTaskRequest) returns (google.protobuf.Empty);
-	rpc Kill(KillRequest) returns (google.protobuf.Empty);
-	rpc Exec(ExecProcessRequest) returns (google.protobuf.Empty);
-	rpc ResizePty(ResizePtyRequest) returns (google.protobuf.Empty);
-	rpc CloseIO(CloseIORequest) returns (google.protobuf.Empty);
-	rpc Update(UpdateTaskRequest) returns (google.protobuf.Empty);
-	rpc Wait(WaitRequest) returns (WaitResponse);
-	rpc Stats(StatsRequest) returns (StatsResponse);
-	rpc Connect(ConnectRequest) returns (ConnectResponse);
-	rpc Shutdown(ShutdownRequest) returns (google.protobuf.Empty);
-}
-
-message CreateTaskRequest {
-	string id = 1;
-	string bundle = 2;
-	repeated containerd.types.Mount rootfs = 3;
-	bool terminal = 4;
-	string stdin = 5;
-	string stdout = 6;
-	string stderr = 7;
-	string checkpoint = 8;
-	string parent_checkpoint = 9;
-	google.protobuf.Any options = 10;
-}
-
-message CreateTaskResponse {
-	uint32 pid = 1;
-}
-
-message DeleteRequest {
-	string id = 1;
-	string exec_id = 2;
-}
-
-message DeleteResponse {
-	uint32 pid = 1;
-	uint32 exit_status = 2;
-	google.protobuf.Timestamp exited_at = 3;
-}
-
-message ExecProcessRequest {
-	string id = 1;
-	string exec_id = 2;
-	bool terminal = 3;
-	string stdin = 4;
-	string stdout = 5;
-	string stderr = 6;
-	google.protobuf.Any spec = 7;
-}
-
-message ExecProcessResponse {
-}
-
-message ResizePtyRequest {
-	string id = 1;
-	string exec_id = 2;
-	uint32 width = 3;
-	uint32 height = 4;
-}
-
-message StateRequest {
-	string id = 1;
-	string exec_id = 2;
-}
-
-message StateResponse {
-	string id = 1;
-	string bundle = 2;
-	uint32 pid = 3;
-	containerd.v1.types.Status status = 4;
-	string stdin = 5;
-	string stdout = 6;
-	string stderr = 7;
-	bool terminal = 8;
-	uint32 exit_status = 9;
-	google.protobuf.Timestamp exited_at = 10;
-	string exec_id = 11;
-}
-
-message KillRequest {
-	string id = 1;
-	string exec_id = 2;
-	uint32 signal = 3;
-	bool all = 4;
-}
-
-message CloseIORequest {
-	string id = 1;
-	string exec_id = 2;
-	bool stdin = 3;
-}
-
-message PidsRequest {
-	string id = 1;
-}
-
-message PidsResponse {
-	repeated containerd.v1.types.ProcessInfo processes = 1;
-}
-
-message CheckpointTaskRequest {
-	string id = 1;
-	string path = 2;
-	google.protobuf.Any options = 3;
-}
-
-message UpdateTaskRequest {
-	string id = 1;
-	google.protobuf.Any resources = 2;
-	map<string, string> annotations = 3;
-}
-
-message StartRequest {
-	string id = 1;
-	string exec_id = 2;
-}
-
-message StartResponse {
-	uint32 pid = 1;
-}
-
-message WaitRequest {
-	string id = 1;
-	string exec_id = 2;
-}
-
-message WaitResponse {
-	uint32 exit_status = 1;
-	google.protobuf.Timestamp exited_at = 2;
-}
-
-message StatsRequest {
-	string id = 1;
-}
-
-message StatsResponse {
-	google.protobuf.Any stats = 1;
-}
-
-message ConnectRequest {
-	string id = 1;
-}
-
-message ConnectResponse {
-	uint32 shim_pid = 1;
-	uint32 task_pid = 2;
-	string version = 3;
-}
-
-message ShutdownRequest {
-	string id = 1;
-	bool now = 2;
-}
-
-message PauseRequest {
-	string id = 1;
-}
-
-message ResumeRequest {
-	string id = 1;
-}