diff --git a/Protobuild.toml b/Protobuild.toml index 5292eecce..bb68f7ce2 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -33,7 +33,11 @@ plugins = ["grpc", "fieldpath"] [[overrides]] # enable ttrpc and disable fieldpath and grpc for the shim -prefixes = ["github.com/containerd/containerd/runtime/v1/shim/v1", "github.com/containerd/containerd/runtime/v2/task"] +prefixes = [ + "github.com/containerd/containerd/runtime/v1/shim/v1", + "github.com/containerd/containerd/api/runtime/task/v2", + "github.com/containerd/containerd/api/runtime/sandbox/v1", +] plugins = ["ttrpc"] # Lock down runc config diff --git a/api/Protobuild.toml b/api/Protobuild.toml index 8205aaf3e..d1815786e 100644 --- a/api/Protobuild.toml +++ b/api/Protobuild.toml @@ -41,7 +41,11 @@ plugins = ["ttrpc", "fieldpath"] [[overrides]] # enable ttrpc and disable fieldpath and grpc for the shim -prefixes = ["github.com/containerd/containerd/runtime/v1/shim/v1", "github.com/containerd/containerd/runtime/v2/task"] +prefixes = [ + "github.com/containerd/containerd/runtime/v1/shim/v1", + "github.com/containerd/containerd/api/runtime/task/v2", + "github.com/containerd/containerd/api/runtime/sandbox/v1", +] plugins = ["ttrpc"] # Aggregrate the API descriptors to lock down API changes. diff --git a/api/next.pb.txt b/api/next.pb.txt index a0330f8c5..99f49206a 100644 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -782,6 +782,298 @@ file { } syntax: "proto3" } +file { + name: "github.com/containerd/containerd/api/runtime/sandbox/v1/sandbox.proto" + package: "containerd.runtime.sandbox.v1" + dependency: "google/protobuf/any.proto" + dependency: "google/protobuf/timestamp.proto" + dependency: "gogoproto/gogo.proto" + dependency: "github.com/containerd/containerd/api/types/mount.proto" + message_type { + name: "StartSandboxRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + field { + name: "bundle_path" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "bundlePath" + } + field { + name: "rootfs" + number: 3 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.types.Mount" + json_name: "rootfs" + } + field { + name: "options" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "options" + } + } + message_type { + name: "StartSandboxResponse" + field { + name: "pid" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + } + message_type { + name: "StopSandboxRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + field { + name: "timeout_secs" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "timeoutSecs" + } + } + message_type { + name: "StopSandboxResponse" + } + message_type { + name: "UpdateSandboxRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + field { + name: "resources" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "resources" + } + field { + name: "annotations" + number: 3 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.runtime.sandbox.v1.UpdateSandboxRequest.AnnotationsEntry" + json_name: "annotations" + } + nested_type { + name: "AnnotationsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "WaitSandboxRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + } + message_type { + name: "WaitSandboxResponse" + field { + name: "exit_status" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + json_name: "exitedAt" + } + } + message_type { + name: "UpdateSandboxResponse" + } + message_type { + name: "SandboxStatusRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + } + message_type { + name: "PauseSandboxRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + } + message_type { + name: "PauseSandboxResponse" + } + message_type { + name: "ResumeSandboxRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + } + message_type { + name: "ResumeSandboxResponse" + } + message_type { + name: "SandboxStatusResponse" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "pid" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "state" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "state" + } + field { + name: "exit_status" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + json_name: "exitedAt" + } + field { + name: "extra" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "extra" + } + } + message_type { + name: "PingRequest" + field { + name: "sandbox_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "sandboxId" + } + } + message_type { + name: "PingResponse" + } + service { + name: "Sandbox" + method { + name: "StartSandbox" + input_type: ".containerd.runtime.sandbox.v1.StartSandboxRequest" + output_type: ".containerd.runtime.sandbox.v1.StartSandboxResponse" + } + method { + name: "StopSandbox" + input_type: ".containerd.runtime.sandbox.v1.StopSandboxRequest" + output_type: ".containerd.runtime.sandbox.v1.StopSandboxResponse" + } + method { + name: "WaitSandbox" + input_type: ".containerd.runtime.sandbox.v1.WaitSandboxRequest" + output_type: ".containerd.runtime.sandbox.v1.WaitSandboxResponse" + } + method { + name: "UpdateSandbox" + input_type: ".containerd.runtime.sandbox.v1.UpdateSandboxRequest" + output_type: ".containerd.runtime.sandbox.v1.UpdateSandboxResponse" + } + method { + name: "PauseSandbox" + input_type: ".containerd.runtime.sandbox.v1.PauseSandboxRequest" + output_type: ".containerd.runtime.sandbox.v1.PauseSandboxResponse" + } + method { + name: "ResumeSandbox" + input_type: ".containerd.runtime.sandbox.v1.ResumeSandboxRequest" + output_type: ".containerd.runtime.sandbox.v1.ResumeSandboxResponse" + } + method { + name: "SandboxStatus" + input_type: ".containerd.runtime.sandbox.v1.SandboxStatusRequest" + output_type: ".containerd.runtime.sandbox.v1.SandboxStatusResponse" + } + method { + name: "PingSandbox" + input_type: ".containerd.runtime.sandbox.v1.PingRequest" + output_type: ".containerd.runtime.sandbox.v1.PingResponse" + } + } + options { + go_package: "github.com/containerd/containerd/api/runtime/sandbox/v1;sandbox" + } + weak_dependency: 2 + syntax: "proto3" +} file { name: "google/protobuf/empty.proto" package: "google.protobuf" @@ -799,6 +1091,850 @@ file { } syntax: "proto3" } +file { + name: "github.com/containerd/containerd/api/types/task/task.proto" + package: "containerd.v1.types" + dependency: "gogoproto/gogo.proto" + dependency: "google/protobuf/timestamp.proto" + dependency: "google/protobuf/any.proto" + message_type { + name: "Process" + field { + name: "container_id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "containerId" + } + field { + name: "id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "pid" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "status" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_ENUM + type_name: ".containerd.v1.types.Status" + json_name: "status" + } + field { + name: "stdin" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdin" + } + field { + name: "stdout" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdout" + } + field { + name: "stderr" + number: 7 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stderr" + } + field { + name: "terminal" + number: 8 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "terminal" + } + field { + name: "exit_status" + number: 9 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 10 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + json_name: "exitedAt" + } + } + message_type { + name: "ProcessInfo" + field { + name: "pid" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "info" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "info" + } + } + enum_type { + name: "Status" + value { + name: "UNKNOWN" + number: 0 + } + value { + name: "CREATED" + number: 1 + } + value { + name: "RUNNING" + number: 2 + } + value { + name: "STOPPED" + number: 3 + } + value { + name: "PAUSED" + number: 4 + } + value { + name: "PAUSING" + number: 5 + } + } + syntax: "proto3" +} +file { + name: "github.com/containerd/containerd/api/runtime/task/v2/shim.proto" + package: "containerd.task.v2" + dependency: "google/protobuf/any.proto" + dependency: "google/protobuf/empty.proto" + dependency: "gogoproto/gogo.proto" + dependency: "google/protobuf/timestamp.proto" + dependency: "github.com/containerd/containerd/api/types/mount.proto" + dependency: "github.com/containerd/containerd/api/types/task/task.proto" + message_type { + name: "CreateTaskRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "bundle" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "bundle" + } + field { + name: "rootfs" + number: 3 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.types.Mount" + json_name: "rootfs" + } + field { + name: "terminal" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "terminal" + } + field { + name: "stdin" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdin" + } + field { + name: "stdout" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdout" + } + field { + name: "stderr" + number: 7 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stderr" + } + field { + name: "checkpoint" + number: 8 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "checkpoint" + } + field { + name: "parent_checkpoint" + number: 9 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "parentCheckpoint" + } + field { + name: "options" + number: 10 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "options" + } + } + message_type { + name: "CreateTaskResponse" + field { + name: "pid" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + } + message_type { + name: "DeleteRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + message_type { + name: "DeleteResponse" + field { + name: "pid" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "exit_status" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + json_name: "exitedAt" + } + } + message_type { + name: "ExecProcessRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + field { + name: "terminal" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "terminal" + } + field { + name: "stdin" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdin" + } + field { + name: "stdout" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdout" + } + field { + name: "stderr" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stderr" + } + field { + name: "spec" + number: 7 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "spec" + } + } + message_type { + name: "ExecProcessResponse" + } + message_type { + name: "ResizePtyRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + field { + name: "width" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "width" + } + field { + name: "height" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "height" + } + } + message_type { + name: "StateRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + message_type { + name: "StateResponse" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "bundle" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "bundle" + } + field { + name: "pid" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + field { + name: "status" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_ENUM + type_name: ".containerd.v1.types.Status" + json_name: "status" + } + field { + name: "stdin" + number: 5 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdin" + } + field { + name: "stdout" + number: 6 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stdout" + } + field { + name: "stderr" + number: 7 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "stderr" + } + field { + name: "terminal" + number: 8 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "terminal" + } + field { + name: "exit_status" + number: 9 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 10 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + json_name: "exitedAt" + } + field { + name: "exec_id" + number: 11 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + message_type { + name: "KillRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + field { + name: "signal" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "signal" + } + field { + name: "all" + number: 4 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "all" + } + } + message_type { + name: "CloseIORequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + field { + name: "stdin" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "stdin" + } + } + message_type { + name: "PidsRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + } + message_type { + name: "PidsResponse" + field { + name: "processes" + number: 1 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.v1.types.ProcessInfo" + json_name: "processes" + } + } + message_type { + name: "CheckpointTaskRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "path" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "path" + } + field { + name: "options" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "options" + } + } + message_type { + name: "UpdateTaskRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "resources" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "resources" + } + field { + name: "annotations" + number: 3 + label: LABEL_REPEATED + type: TYPE_MESSAGE + type_name: ".containerd.task.v2.UpdateTaskRequest.AnnotationsEntry" + json_name: "annotations" + } + nested_type { + name: "AnnotationsEntry" + field { + name: "key" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "key" + } + field { + name: "value" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "value" + } + options { + map_entry: true + } + } + } + message_type { + name: "StartRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + message_type { + name: "StartResponse" + field { + name: "pid" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "pid" + } + } + message_type { + name: "WaitRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "exec_id" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "execId" + } + } + message_type { + name: "WaitResponse" + field { + name: "exit_status" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "exitStatus" + } + field { + name: "exited_at" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Timestamp" + json_name: "exitedAt" + } + } + message_type { + name: "StatsRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + } + message_type { + name: "StatsResponse" + field { + name: "stats" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_MESSAGE + type_name: ".google.protobuf.Any" + json_name: "stats" + } + } + message_type { + name: "ConnectRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + } + message_type { + name: "ConnectResponse" + field { + name: "shim_pid" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "shimPid" + } + field { + name: "task_pid" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_UINT32 + json_name: "taskPid" + } + field { + name: "version" + number: 3 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "version" + } + } + message_type { + name: "ShutdownRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + field { + name: "now" + number: 2 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "now" + } + } + message_type { + name: "PauseRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + } + message_type { + name: "ResumeRequest" + field { + name: "id" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_STRING + json_name: "id" + } + } + service { + name: "Task" + method { + name: "State" + input_type: ".containerd.task.v2.StateRequest" + output_type: ".containerd.task.v2.StateResponse" + } + method { + name: "Create" + input_type: ".containerd.task.v2.CreateTaskRequest" + output_type: ".containerd.task.v2.CreateTaskResponse" + } + method { + name: "Start" + input_type: ".containerd.task.v2.StartRequest" + output_type: ".containerd.task.v2.StartResponse" + } + method { + name: "Delete" + input_type: ".containerd.task.v2.DeleteRequest" + output_type: ".containerd.task.v2.DeleteResponse" + } + method { + name: "Pids" + input_type: ".containerd.task.v2.PidsRequest" + output_type: ".containerd.task.v2.PidsResponse" + } + method { + name: "Pause" + input_type: ".containerd.task.v2.PauseRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "Resume" + input_type: ".containerd.task.v2.ResumeRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "Checkpoint" + input_type: ".containerd.task.v2.CheckpointTaskRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "Kill" + input_type: ".containerd.task.v2.KillRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "Exec" + input_type: ".containerd.task.v2.ExecProcessRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "ResizePty" + input_type: ".containerd.task.v2.ResizePtyRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "CloseIO" + input_type: ".containerd.task.v2.CloseIORequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "Update" + input_type: ".containerd.task.v2.UpdateTaskRequest" + output_type: ".google.protobuf.Empty" + } + method { + name: "Wait" + input_type: ".containerd.task.v2.WaitRequest" + output_type: ".containerd.task.v2.WaitResponse" + } + method { + name: "Stats" + input_type: ".containerd.task.v2.StatsRequest" + output_type: ".containerd.task.v2.StatsResponse" + } + method { + name: "Connect" + input_type: ".containerd.task.v2.ConnectRequest" + output_type: ".containerd.task.v2.ConnectResponse" + } + method { + name: "Shutdown" + input_type: ".containerd.task.v2.ShutdownRequest" + output_type: ".google.protobuf.Empty" + } + } + options { + go_package: "github.com/containerd/containerd/api/runtime/task/v2;task" + } + syntax: "proto3" +} file { name: "google/protobuf/field_mask.proto" package: "google.protobuf" @@ -3916,134 +5052,6 @@ file { } syntax: "proto3" } -file { - name: "github.com/containerd/containerd/api/types/task/task.proto" - package: "containerd.v1.types" - dependency: "gogoproto/gogo.proto" - dependency: "google/protobuf/timestamp.proto" - dependency: "google/protobuf/any.proto" - message_type { - name: "Process" - field { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field { - name: "id" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "id" - } - field { - name: "pid" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - field { - name: "status" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_ENUM - type_name: ".containerd.v1.types.Status" - json_name: "status" - } - field { - name: "stdin" - number: 5 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stdin" - } - field { - name: "stdout" - number: 6 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stdout" - } - field { - name: "stderr" - number: 7 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stderr" - } - field { - name: "terminal" - number: 8 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "terminal" - } - field { - name: "exit_status" - number: 9 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "exitStatus" - } - field { - name: "exited_at" - number: 10 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Timestamp" - json_name: "exitedAt" - } - } - message_type { - name: "ProcessInfo" - field { - name: "pid" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_UINT32 - json_name: "pid" - } - field { - name: "info" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_MESSAGE - type_name: ".google.protobuf.Any" - json_name: "info" - } - } - enum_type { - name: "Status" - value { - name: "UNKNOWN" - number: 0 - } - value { - name: "CREATED" - number: 1 - } - value { - name: "RUNNING" - number: 2 - } - value { - name: "STOPPED" - number: 3 - } - value { - name: "PAUSED" - number: 4 - } - value { - name: "PAUSING" - number: 5 - } - } - syntax: "proto3" -} file { name: "github.com/containerd/containerd/api/services/tasks/v1/tasks.proto" package: "containerd.services.tasks.v1" diff --git a/api/runtime/sandbox/v1/doc.go b/api/runtime/sandbox/v1/doc.go new file mode 100644 index 000000000..f960350c1 --- /dev/null +++ b/api/runtime/sandbox/v1/doc.go @@ -0,0 +1,17 @@ +/* + 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 sandbox diff --git a/runtime/v2/task/sandbox.pb.go b/api/runtime/sandbox/v1/sandbox.pb.go similarity index 91% rename from runtime/v2/task/sandbox.pb.go rename to api/runtime/sandbox/v1/sandbox.pb.go index 7542e3443..877ee2117 100644 --- a/runtime/v2/task/sandbox.pb.go +++ b/api/runtime/sandbox/v1/sandbox.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/runtime/v2/task/sandbox.proto +// source: github.com/containerd/containerd/api/runtime/sandbox/v1/sandbox.proto -package task +package sandbox import ( context "context" @@ -42,7 +42,7 @@ type StartSandboxRequest struct { func (m *StartSandboxRequest) Reset() { *m = StartSandboxRequest{} } func (*StartSandboxRequest) ProtoMessage() {} func (*StartSandboxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{0} + return fileDescriptor_bd1ee4d461c4cb0a, []int{0} } func (m *StartSandboxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,7 +81,7 @@ type StartSandboxResponse struct { func (m *StartSandboxResponse) Reset() { *m = StartSandboxResponse{} } func (*StartSandboxResponse) ProtoMessage() {} func (*StartSandboxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{1} + return fileDescriptor_bd1ee4d461c4cb0a, []int{1} } func (m *StartSandboxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -121,7 +121,7 @@ type StopSandboxRequest struct { func (m *StopSandboxRequest) Reset() { *m = StopSandboxRequest{} } func (*StopSandboxRequest) ProtoMessage() {} func (*StopSandboxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{2} + return fileDescriptor_bd1ee4d461c4cb0a, []int{2} } func (m *StopSandboxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +159,7 @@ type StopSandboxResponse struct { func (m *StopSandboxResponse) Reset() { *m = StopSandboxResponse{} } func (*StopSandboxResponse) ProtoMessage() {} func (*StopSandboxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{3} + return fileDescriptor_bd1ee4d461c4cb0a, []int{3} } func (m *StopSandboxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -200,7 +200,7 @@ type UpdateSandboxRequest struct { func (m *UpdateSandboxRequest) Reset() { *m = UpdateSandboxRequest{} } func (*UpdateSandboxRequest) ProtoMessage() {} func (*UpdateSandboxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{4} + return fileDescriptor_bd1ee4d461c4cb0a, []int{4} } func (m *UpdateSandboxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -239,7 +239,7 @@ type WaitSandboxRequest struct { func (m *WaitSandboxRequest) Reset() { *m = WaitSandboxRequest{} } func (*WaitSandboxRequest) ProtoMessage() {} func (*WaitSandboxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{5} + return fileDescriptor_bd1ee4d461c4cb0a, []int{5} } func (m *WaitSandboxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -279,7 +279,7 @@ type WaitSandboxResponse struct { func (m *WaitSandboxResponse) Reset() { *m = WaitSandboxResponse{} } func (*WaitSandboxResponse) ProtoMessage() {} func (*WaitSandboxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{6} + return fileDescriptor_bd1ee4d461c4cb0a, []int{6} } func (m *WaitSandboxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -317,7 +317,7 @@ type UpdateSandboxResponse struct { func (m *UpdateSandboxResponse) Reset() { *m = UpdateSandboxResponse{} } func (*UpdateSandboxResponse) ProtoMessage() {} func (*UpdateSandboxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{7} + return fileDescriptor_bd1ee4d461c4cb0a, []int{7} } func (m *UpdateSandboxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -356,7 +356,7 @@ type SandboxStatusRequest struct { func (m *SandboxStatusRequest) Reset() { *m = SandboxStatusRequest{} } func (*SandboxStatusRequest) ProtoMessage() {} func (*SandboxStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{8} + return fileDescriptor_bd1ee4d461c4cb0a, []int{8} } func (m *SandboxStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -395,7 +395,7 @@ type PauseSandboxRequest struct { func (m *PauseSandboxRequest) Reset() { *m = PauseSandboxRequest{} } func (*PauseSandboxRequest) ProtoMessage() {} func (*PauseSandboxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{9} + return fileDescriptor_bd1ee4d461c4cb0a, []int{9} } func (m *PauseSandboxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -433,7 +433,7 @@ type PauseSandboxResponse struct { func (m *PauseSandboxResponse) Reset() { *m = PauseSandboxResponse{} } func (*PauseSandboxResponse) ProtoMessage() {} func (*PauseSandboxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{10} + return fileDescriptor_bd1ee4d461c4cb0a, []int{10} } func (m *PauseSandboxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -472,7 +472,7 @@ type ResumeSandboxRequest struct { func (m *ResumeSandboxRequest) Reset() { *m = ResumeSandboxRequest{} } func (*ResumeSandboxRequest) ProtoMessage() {} func (*ResumeSandboxRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{11} + return fileDescriptor_bd1ee4d461c4cb0a, []int{11} } func (m *ResumeSandboxRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -510,7 +510,7 @@ type ResumeSandboxResponse struct { func (m *ResumeSandboxResponse) Reset() { *m = ResumeSandboxResponse{} } func (*ResumeSandboxResponse) ProtoMessage() {} func (*ResumeSandboxResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{12} + return fileDescriptor_bd1ee4d461c4cb0a, []int{12} } func (m *ResumeSandboxResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -554,7 +554,7 @@ type SandboxStatusResponse struct { func (m *SandboxStatusResponse) Reset() { *m = SandboxStatusResponse{} } func (*SandboxStatusResponse) ProtoMessage() {} func (*SandboxStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{13} + return fileDescriptor_bd1ee4d461c4cb0a, []int{13} } func (m *SandboxStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -593,7 +593,7 @@ type PingRequest struct { func (m *PingRequest) Reset() { *m = PingRequest{} } func (*PingRequest) ProtoMessage() {} func (*PingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{14} + return fileDescriptor_bd1ee4d461c4cb0a, []int{14} } func (m *PingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -631,7 +631,7 @@ type PingResponse struct { func (m *PingResponse) Reset() { *m = PingResponse{} } func (*PingResponse) ProtoMessage() {} func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1a2e6d1f55947a07, []int{15} + return fileDescriptor_bd1ee4d461c4cb0a, []int{15} } func (m *PingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -661,80 +661,81 @@ func (m *PingResponse) XXX_DiscardUnknown() { var xxx_messageInfo_PingResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*StartSandboxRequest)(nil), "containerd.task.v2.StartSandboxRequest") - proto.RegisterType((*StartSandboxResponse)(nil), "containerd.task.v2.StartSandboxResponse") - proto.RegisterType((*StopSandboxRequest)(nil), "containerd.task.v2.StopSandboxRequest") - proto.RegisterType((*StopSandboxResponse)(nil), "containerd.task.v2.StopSandboxResponse") - proto.RegisterType((*UpdateSandboxRequest)(nil), "containerd.task.v2.UpdateSandboxRequest") - proto.RegisterMapType((map[string]string)(nil), "containerd.task.v2.UpdateSandboxRequest.AnnotationsEntry") - proto.RegisterType((*WaitSandboxRequest)(nil), "containerd.task.v2.WaitSandboxRequest") - proto.RegisterType((*WaitSandboxResponse)(nil), "containerd.task.v2.WaitSandboxResponse") - proto.RegisterType((*UpdateSandboxResponse)(nil), "containerd.task.v2.UpdateSandboxResponse") - proto.RegisterType((*SandboxStatusRequest)(nil), "containerd.task.v2.SandboxStatusRequest") - proto.RegisterType((*PauseSandboxRequest)(nil), "containerd.task.v2.PauseSandboxRequest") - proto.RegisterType((*PauseSandboxResponse)(nil), "containerd.task.v2.PauseSandboxResponse") - proto.RegisterType((*ResumeSandboxRequest)(nil), "containerd.task.v2.ResumeSandboxRequest") - proto.RegisterType((*ResumeSandboxResponse)(nil), "containerd.task.v2.ResumeSandboxResponse") - proto.RegisterType((*SandboxStatusResponse)(nil), "containerd.task.v2.SandboxStatusResponse") - proto.RegisterType((*PingRequest)(nil), "containerd.task.v2.PingRequest") - proto.RegisterType((*PingResponse)(nil), "containerd.task.v2.PingResponse") + proto.RegisterType((*StartSandboxRequest)(nil), "containerd.runtime.sandbox.v1.StartSandboxRequest") + proto.RegisterType((*StartSandboxResponse)(nil), "containerd.runtime.sandbox.v1.StartSandboxResponse") + proto.RegisterType((*StopSandboxRequest)(nil), "containerd.runtime.sandbox.v1.StopSandboxRequest") + proto.RegisterType((*StopSandboxResponse)(nil), "containerd.runtime.sandbox.v1.StopSandboxResponse") + proto.RegisterType((*UpdateSandboxRequest)(nil), "containerd.runtime.sandbox.v1.UpdateSandboxRequest") + proto.RegisterMapType((map[string]string)(nil), "containerd.runtime.sandbox.v1.UpdateSandboxRequest.AnnotationsEntry") + proto.RegisterType((*WaitSandboxRequest)(nil), "containerd.runtime.sandbox.v1.WaitSandboxRequest") + proto.RegisterType((*WaitSandboxResponse)(nil), "containerd.runtime.sandbox.v1.WaitSandboxResponse") + proto.RegisterType((*UpdateSandboxResponse)(nil), "containerd.runtime.sandbox.v1.UpdateSandboxResponse") + proto.RegisterType((*SandboxStatusRequest)(nil), "containerd.runtime.sandbox.v1.SandboxStatusRequest") + proto.RegisterType((*PauseSandboxRequest)(nil), "containerd.runtime.sandbox.v1.PauseSandboxRequest") + proto.RegisterType((*PauseSandboxResponse)(nil), "containerd.runtime.sandbox.v1.PauseSandboxResponse") + proto.RegisterType((*ResumeSandboxRequest)(nil), "containerd.runtime.sandbox.v1.ResumeSandboxRequest") + proto.RegisterType((*ResumeSandboxResponse)(nil), "containerd.runtime.sandbox.v1.ResumeSandboxResponse") + proto.RegisterType((*SandboxStatusResponse)(nil), "containerd.runtime.sandbox.v1.SandboxStatusResponse") + proto.RegisterType((*PingRequest)(nil), "containerd.runtime.sandbox.v1.PingRequest") + proto.RegisterType((*PingResponse)(nil), "containerd.runtime.sandbox.v1.PingResponse") } func init() { - proto.RegisterFile("github.com/containerd/containerd/runtime/v2/task/sandbox.proto", fileDescriptor_1a2e6d1f55947a07) + proto.RegisterFile("github.com/containerd/containerd/api/runtime/sandbox/v1/sandbox.proto", fileDescriptor_bd1ee4d461c4cb0a) } -var fileDescriptor_1a2e6d1f55947a07 = []byte{ - // 780 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x6b, 0xdb, 0x48, - 0x14, 0x8e, 0xe4, 0xc4, 0x59, 0x3f, 0xd9, 0x4b, 0x98, 0xd8, 0x89, 0x57, 0x07, 0xdb, 0xab, 0xc3, - 0xc6, 0xbb, 0x2c, 0x12, 0x78, 0x61, 0x77, 0xdb, 0x42, 0x20, 0x69, 0x7a, 0xc8, 0xa1, 0x60, 0xe4, - 0x96, 0x16, 0x0a, 0x35, 0x63, 0x6b, 0xe2, 0x88, 0xc4, 0x1a, 0x55, 0x33, 0x0a, 0xf1, 0xad, 0xff, - 0x43, 0xe9, 0x9f, 0x54, 0xc8, 0xb1, 0xc7, 0x5e, 0x1a, 0x1a, 0xff, 0x25, 0x65, 0x3c, 0xe3, 0x58, - 0x76, 0x26, 0x3f, 0x88, 0x6f, 0xa3, 0xd1, 0x37, 0xdf, 0x7b, 0xef, 0x7b, 0xef, 0x7b, 0xb0, 0x3b, - 0x08, 0xf9, 0x71, 0xda, 0x73, 0xfb, 0x74, 0xe8, 0xf5, 0x69, 0xc4, 0x71, 0x18, 0x91, 0x24, 0xc8, - 0x1e, 0x93, 0x34, 0xe2, 0xe1, 0x90, 0x78, 0x67, 0x2d, 0x8f, 0x63, 0x76, 0xe2, 0x31, 0x1c, 0x05, - 0x3d, 0x7a, 0xee, 0xc6, 0x09, 0xe5, 0x14, 0xa1, 0x19, 0xd2, 0x15, 0xbf, 0xdd, 0xb3, 0x96, 0xfd, - 0xdb, 0x80, 0xd2, 0xc1, 0x29, 0xf1, 0x26, 0x88, 0x5e, 0x7a, 0xe4, 0xe1, 0x68, 0x24, 0xe1, 0x76, - 0x7d, 0xf1, 0x97, 0xa0, 0x66, 0x1c, 0x0f, 0x63, 0x05, 0x28, 0x0f, 0xe8, 0x80, 0x4e, 0x8e, 0x9e, - 0x38, 0xa9, 0xdb, 0x7f, 0xef, 0xcd, 0x12, 0xc7, 0xa1, 0xc7, 0x47, 0x31, 0x61, 0xde, 0x90, 0xa6, - 0x11, 0x97, 0xef, 0x9c, 0x2f, 0x06, 0x6c, 0x76, 0x38, 0x4e, 0x78, 0x47, 0x26, 0xed, 0x93, 0x0f, - 0x29, 0x61, 0x1c, 0xfd, 0x0d, 0xa0, 0xca, 0xe8, 0x86, 0x41, 0xd5, 0x68, 0x18, 0xcd, 0xc2, 0x7e, - 0x69, 0x7c, 0x59, 0x2f, 0x28, 0xdc, 0xe1, 0x81, 0x5f, 0x50, 0x80, 0xc3, 0x00, 0xd5, 0xc1, 0xea, - 0xa5, 0x51, 0x70, 0x4a, 0xba, 0x31, 0xe6, 0xc7, 0x55, 0x53, 0xc0, 0x7d, 0x90, 0x57, 0x6d, 0xcc, - 0x8f, 0x91, 0x07, 0xf9, 0x84, 0x52, 0x7e, 0xc4, 0xaa, 0xb9, 0x46, 0xae, 0x69, 0xb5, 0xb6, 0xdd, - 0xac, 0x2a, 0x22, 0x2b, 0xf7, 0xa5, 0xc8, 0xca, 0x57, 0x30, 0xe4, 0xc2, 0x3a, 0x8d, 0x79, 0x48, - 0x23, 0x56, 0x5d, 0x6d, 0x18, 0x4d, 0xab, 0x55, 0x76, 0xa5, 0x30, 0xee, 0x54, 0x18, 0x77, 0x2f, - 0x1a, 0xf9, 0x53, 0x90, 0xd3, 0x84, 0xf2, 0x7c, 0x19, 0x2c, 0xa6, 0x11, 0x23, 0x68, 0x03, 0x72, - 0xb1, 0x2a, 0xa0, 0xe4, 0x8b, 0xa3, 0x43, 0x00, 0x75, 0x38, 0x8d, 0x97, 0xaa, 0xf7, 0x77, 0x28, - 0x8a, 0xb6, 0xd0, 0x94, 0x77, 0x19, 0xe9, 0xb3, 0x49, 0xc1, 0x25, 0xdf, 0x52, 0x77, 0x1d, 0xd2, - 0x67, 0x4e, 0x45, 0xe8, 0x9a, 0x09, 0x23, 0xf3, 0x71, 0x3e, 0x9b, 0x50, 0x7e, 0x1d, 0x07, 0x98, - 0x93, 0xa5, 0x12, 0x68, 0x41, 0x21, 0x21, 0x8c, 0xa6, 0x49, 0x9f, 0xc8, 0xe8, 0xb7, 0x09, 0x34, - 0x83, 0xa1, 0x77, 0x60, 0xe1, 0x28, 0xa2, 0x1c, 0x4b, 0x59, 0x65, 0x23, 0x9e, 0xb8, 0x37, 0xc7, - 0xd3, 0xd5, 0x25, 0xe8, 0xee, 0xcd, 0xde, 0xbe, 0x88, 0x78, 0x32, 0xf2, 0xb3, 0x6c, 0xf6, 0x2e, - 0x6c, 0x2c, 0x02, 0x84, 0xf6, 0x27, 0x64, 0x24, 0x6b, 0xf1, 0xc5, 0x11, 0x95, 0x61, 0xed, 0x0c, - 0x9f, 0xa6, 0x44, 0x4d, 0x88, 0xfc, 0x78, 0x6a, 0xfe, 0x6f, 0x38, 0xfb, 0x80, 0xde, 0xe0, 0x70, - 0xa9, 0x29, 0x74, 0x28, 0x6c, 0xce, 0x71, 0xa8, 0x11, 0xa8, 0x83, 0x45, 0xce, 0x43, 0xde, 0x65, - 0x1c, 0xf3, 0x94, 0xa9, 0x51, 0x00, 0x71, 0xd5, 0x99, 0xdc, 0xa0, 0xff, 0xa0, 0x20, 0xbe, 0x48, - 0xd0, 0xc5, 0x5c, 0x89, 0x69, 0xdf, 0x10, 0xf3, 0xd5, 0xd4, 0x86, 0xfe, 0x2f, 0x12, 0xbc, 0xc7, - 0x9d, 0x6d, 0xa8, 0x2c, 0x48, 0xa5, 0xba, 0x7c, 0x00, 0x65, 0x75, 0x25, 0x43, 0x3c, 0xae, 0x9e, - 0xe7, 0xb0, 0xd9, 0xc6, 0x29, 0x5b, 0x6a, 0x52, 0x9c, 0x2d, 0x28, 0xcf, 0x93, 0xcc, 0x52, 0xf4, - 0x09, 0x4b, 0x87, 0xcb, 0xb1, 0x6f, 0x43, 0x65, 0x81, 0x45, 0xd1, 0x7f, 0x37, 0xa0, 0xb2, 0x20, - 0x81, 0x6a, 0xc7, 0x16, 0x98, 0xd7, 0xc4, 0xf9, 0xf1, 0x65, 0xdd, 0x3c, 0x3c, 0xf0, 0xcd, 0x30, - 0x98, 0x3a, 0xd5, 0xbc, 0x76, 0xaa, 0x98, 0x16, 0xd1, 0x33, 0x52, 0xcd, 0xc9, 0x69, 0x99, 0x7c, - 0x2c, 0xb6, 0x73, 0xf5, 0xee, 0x76, 0xae, 0x3d, 0xbc, 0x9d, 0xe8, 0x2f, 0x58, 0x23, 0xe7, 0x3c, - 0xc1, 0xd5, 0xfc, 0x1d, 0x86, 0x92, 0x10, 0xe7, 0x19, 0x58, 0xed, 0x30, 0x1a, 0x3c, 0x4e, 0xb5, - 0x5f, 0xa1, 0x28, 0x1f, 0x4b, 0x49, 0x5a, 0x9f, 0xf2, 0xb0, 0xae, 0x80, 0x08, 0x43, 0x31, 0xbb, - 0xc8, 0xd0, 0x8e, 0xce, 0xa0, 0x9a, 0x8d, 0x6d, 0x37, 0xef, 0x07, 0xaa, 0x0e, 0xbc, 0x07, 0x2b, - 0xb3, 0x9a, 0xd0, 0x1f, 0xfa, 0x87, 0x8b, 0x2b, 0xd2, 0xde, 0xb9, 0x17, 0x37, 0xe3, 0xcf, 0xf8, - 0x50, 0xcf, 0x7f, 0xd3, 0xec, 0x7a, 0x7e, 0x9d, 0xa1, 0x03, 0x28, 0xcd, 0xd9, 0x0e, 0x35, 0x1f, - 0xba, 0xc4, 0xec, 0x3f, 0x1f, 0x80, 0x54, 0x51, 0x30, 0x14, 0xb3, 0xc6, 0xd1, 0x37, 0x42, 0xe3, - 0x4f, 0x7d, 0x23, 0x74, 0x1e, 0x14, 0x85, 0xcc, 0xb9, 0x47, 0x5f, 0x88, 0xce, 0xa6, 0xfa, 0x42, - 0xb4, 0x56, 0x14, 0x51, 0xe6, 0x9c, 0xa8, 0x8f, 0xa2, 0xdb, 0x57, 0xfa, 0x28, 0x7a, 0x5b, 0xb7, - 0xa5, 0x21, 0xa6, 0x95, 0xd4, 0xb5, 0x22, 0xcc, 0x1c, 0x63, 0x37, 0x6e, 0x07, 0x48, 0xc6, 0xfd, - 0xea, 0xc5, 0x55, 0x6d, 0xe5, 0xdb, 0x55, 0x6d, 0xe5, 0xe3, 0xb8, 0x66, 0x5c, 0x8c, 0x6b, 0xc6, - 0xd7, 0x71, 0xcd, 0xf8, 0x31, 0xae, 0x19, 0x6f, 0xcd, 0x5e, 0x7e, 0xe2, 0xc9, 0x7f, 0x7e, 0x06, - 0x00, 0x00, 0xff, 0xff, 0x27, 0x5f, 0x3e, 0xac, 0x9d, 0x09, 0x00, 0x00, +var fileDescriptor_bd1ee4d461c4cb0a = []byte{ + // 795 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4f, 0x4f, 0xdb, 0x48, + 0x14, 0xc7, 0x0e, 0x84, 0xcd, 0x73, 0xb2, 0x42, 0x43, 0x02, 0x59, 0x4b, 0x9b, 0xb0, 0x3e, 0x45, + 0xec, 0xca, 0x16, 0x61, 0xb5, 0x5b, 0x15, 0xa9, 0x15, 0x34, 0x1c, 0x38, 0x54, 0x42, 0x4e, 0xab, + 0xfe, 0xb9, 0x44, 0x93, 0x78, 0x12, 0xac, 0x12, 0x8f, 0xeb, 0x19, 0x03, 0xe9, 0xa9, 0x1f, 0xa5, + 0xdf, 0xa5, 0xaa, 0xc4, 0xb1, 0xc7, 0x5e, 0x8a, 0x4a, 0x3e, 0x49, 0xe5, 0xcc, 0x84, 0x38, 0xc1, + 0xc5, 0x90, 0xdc, 0x9e, 0x27, 0xbf, 0xf7, 0xef, 0xf7, 0xde, 0xfb, 0x29, 0x70, 0xd8, 0x73, 0xf9, + 0x49, 0xd8, 0x36, 0x3b, 0xb4, 0x6f, 0x75, 0xa8, 0xc7, 0xb1, 0xeb, 0x91, 0xc0, 0x89, 0x9b, 0xd8, + 0x77, 0xad, 0x20, 0xf4, 0xb8, 0xdb, 0x27, 0x16, 0xc3, 0x9e, 0xd3, 0xa6, 0x17, 0xd6, 0xd9, 0xce, + 0xd8, 0x34, 0xfd, 0x80, 0x72, 0x8a, 0xfe, 0x9c, 0x38, 0x98, 0x12, 0x6c, 0x8e, 0x11, 0x67, 0x3b, + 0xfa, 0x1f, 0x3d, 0x4a, 0x7b, 0xa7, 0xc4, 0x1a, 0x81, 0xdb, 0x61, 0xd7, 0xc2, 0xde, 0x40, 0x78, + 0xea, 0xd5, 0xd9, 0x9f, 0x22, 0x5f, 0xc6, 0x71, 0xdf, 0x97, 0x80, 0x62, 0x8f, 0xf6, 0xe8, 0xc8, + 0xb4, 0x22, 0x4b, 0xbe, 0xfe, 0x77, 0xaf, 0xba, 0xf9, 0xc0, 0x27, 0xcc, 0xea, 0xd3, 0xd0, 0xe3, + 0xc2, 0xcf, 0xf8, 0xa2, 0xc0, 0x7a, 0x93, 0xe3, 0x80, 0x37, 0x45, 0x75, 0x36, 0x79, 0x1f, 0x12, + 0xc6, 0xd1, 0x3f, 0x00, 0xb2, 0xde, 0x96, 0xeb, 0x94, 0x95, 0x2d, 0xa5, 0x96, 0x3b, 0x28, 0x0c, + 0xaf, 0xaa, 0x39, 0x89, 0x3b, 0x6a, 0xd8, 0x39, 0x09, 0x38, 0x72, 0x50, 0x15, 0xb4, 0x76, 0xe8, + 0x39, 0xa7, 0xa4, 0xe5, 0x63, 0x7e, 0x52, 0x56, 0x23, 0xb8, 0x0d, 0xe2, 0xe9, 0x18, 0xf3, 0x13, + 0x64, 0x41, 0x36, 0xa0, 0x94, 0x77, 0x59, 0x39, 0xb3, 0x95, 0xa9, 0x69, 0xf5, 0x4d, 0x33, 0x46, + 0xd0, 0xa8, 0x2a, 0xf3, 0x79, 0x54, 0x95, 0x2d, 0x61, 0xc8, 0x84, 0x55, 0xea, 0x73, 0x97, 0x7a, + 0xac, 0xbc, 0xbc, 0xa5, 0xd4, 0xb4, 0x7a, 0xd1, 0x14, 0xc4, 0x98, 0x63, 0x62, 0xcc, 0x7d, 0x6f, + 0x60, 0x8f, 0x41, 0x46, 0x0d, 0x8a, 0xd3, 0x6d, 0x30, 0x9f, 0x7a, 0x8c, 0xa0, 0x35, 0xc8, 0xf8, + 0xb2, 0x81, 0x82, 0x1d, 0x99, 0x06, 0x01, 0xd4, 0xe4, 0xd4, 0x5f, 0xa8, 0xdf, 0xbf, 0x20, 0x1f, + 0x8d, 0x85, 0x86, 0xbc, 0xc5, 0x48, 0x87, 0x8d, 0x1a, 0x2e, 0xd8, 0x9a, 0x7c, 0x6b, 0x92, 0x0e, + 0x33, 0x4a, 0x11, 0xaf, 0xb1, 0x34, 0xa2, 0x1e, 0xe3, 0x93, 0x0a, 0xc5, 0x97, 0xbe, 0x83, 0x39, + 0x59, 0xa8, 0x80, 0x3a, 0xe4, 0x02, 0xc2, 0x68, 0x18, 0x74, 0x88, 0xc8, 0xfe, 0x2b, 0x82, 0x26, + 0x30, 0xd4, 0x05, 0x0d, 0x7b, 0x1e, 0xe5, 0x58, 0xd0, 0x2a, 0x06, 0xd1, 0x30, 0xef, 0xdc, 0x54, + 0x33, 0xa9, 0x56, 0x73, 0x7f, 0x12, 0xe6, 0xd0, 0xe3, 0xc1, 0xc0, 0x8e, 0x07, 0xd6, 0x9f, 0xc0, + 0xda, 0x2c, 0x20, 0x1a, 0xc3, 0x3b, 0x32, 0x10, 0x6d, 0xd9, 0x91, 0x89, 0x8a, 0xb0, 0x72, 0x86, + 0x4f, 0x43, 0x22, 0x97, 0x45, 0x7c, 0x3c, 0x56, 0x1f, 0x29, 0xc6, 0x01, 0xa0, 0x57, 0xd8, 0x5d, + 0x68, 0x21, 0x0d, 0x0a, 0xeb, 0x53, 0x31, 0xe4, 0x36, 0x54, 0x41, 0x23, 0x17, 0x2e, 0x6f, 0x31, + 0x8e, 0x79, 0xc8, 0xe4, 0x56, 0x40, 0xf4, 0xd4, 0x1c, 0xbd, 0xa0, 0xff, 0x21, 0x17, 0x7d, 0x11, + 0xa7, 0x85, 0xb9, 0xe4, 0x55, 0xbf, 0xc5, 0xeb, 0x8b, 0xf1, 0x45, 0xda, 0xbf, 0x09, 0xf0, 0x3e, + 0x37, 0x36, 0xa1, 0x34, 0x43, 0x95, 0x1c, 0x78, 0x03, 0x8a, 0xf2, 0x49, 0xa4, 0x98, 0xaf, 0x9f, + 0x67, 0xb0, 0x7e, 0x8c, 0x43, 0xb6, 0xd0, 0xd2, 0x18, 0x1b, 0x50, 0x9c, 0x0e, 0x32, 0x29, 0xd1, + 0x26, 0x2c, 0xec, 0x2f, 0x16, 0x7d, 0x13, 0x4a, 0x33, 0x51, 0x64, 0xf8, 0xef, 0x0a, 0x94, 0x66, + 0x28, 0x90, 0xe3, 0xd8, 0x00, 0xf5, 0x26, 0x70, 0x76, 0x78, 0x55, 0x55, 0x8f, 0x1a, 0xb6, 0xea, + 0x3a, 0xe3, 0xa3, 0x55, 0x6f, 0x8e, 0x36, 0xda, 0x96, 0x68, 0x66, 0xa4, 0x9c, 0x11, 0xdb, 0x32, + 0xfa, 0x98, 0x1d, 0xe7, 0xf2, 0xdd, 0xe3, 0x5c, 0xb9, 0xff, 0x38, 0xd1, 0x36, 0xac, 0x90, 0x0b, + 0x1e, 0xe0, 0x72, 0xf6, 0x8e, 0xdb, 0x12, 0x10, 0x63, 0x0f, 0xb4, 0x63, 0xd7, 0xeb, 0xcd, 0xc7, + 0xda, 0xef, 0x90, 0x17, 0xce, 0x82, 0x92, 0xfa, 0xe7, 0x55, 0x58, 0x95, 0x40, 0x74, 0x0e, 0xf9, + 0xb8, 0xa6, 0xa1, 0x7a, 0xca, 0xad, 0x26, 0xe8, 0xb8, 0xbe, 0xfb, 0x20, 0x1f, 0x39, 0x17, 0x0e, + 0x5a, 0x4c, 0xbb, 0xd0, 0x4e, 0x6a, 0x8c, 0x59, 0x39, 0xd5, 0xeb, 0x0f, 0x71, 0x99, 0x64, 0x8d, + 0xdd, 0x6c, 0x6a, 0xd6, 0xdb, 0x1a, 0x91, 0x9a, 0x35, 0x49, 0x12, 0x3e, 0x40, 0x61, 0xea, 0x70, + 0xd1, 0xee, 0x1c, 0x8a, 0xa8, 0xff, 0xfb, 0x30, 0x27, 0x99, 0xfb, 0x1c, 0xf2, 0xf1, 0x83, 0x4c, + 0x1d, 0x70, 0x82, 0x04, 0xa4, 0x0e, 0x38, 0xe9, 0xe2, 0xa3, 0xa6, 0xa7, 0x6e, 0x35, 0xb5, 0xe9, + 0x24, 0x7d, 0x48, 0x6d, 0x3a, 0x51, 0x0e, 0xa2, 0xdc, 0x53, 0x6a, 0x90, 0x9a, 0x3b, 0x49, 0x3e, + 0x53, 0x73, 0x27, 0x0b, 0x4e, 0x57, 0x9c, 0xea, 0xb8, 0xeb, 0xed, 0x34, 0xee, 0x26, 0x67, 0xad, + 0xff, 0x7d, 0x2f, 0xac, 0xc8, 0x73, 0xf0, 0xe6, 0xf2, 0xba, 0xb2, 0xf4, 0xed, 0xba, 0xb2, 0xf4, + 0x71, 0x58, 0x51, 0x2e, 0x87, 0x15, 0xe5, 0xeb, 0xb0, 0xa2, 0xfc, 0x18, 0x56, 0x94, 0xb7, 0x4f, + 0xe7, 0xfc, 0x7f, 0xb9, 0x27, 0xcd, 0xd7, 0x6a, 0x3b, 0x3b, 0x12, 0xa1, 0xdd, 0x9f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x59, 0xf5, 0x57, 0xa8, 0xab, 0x0a, 0x00, 0x00, } func (m *StartSandboxRequest) Marshal() (dAtA []byte, err error) { @@ -1885,7 +1886,7 @@ type SandboxService interface { } func RegisterSandboxService(srv *github_com_containerd_ttrpc.Server, svc SandboxService) { - srv.Register("containerd.task.v2.Sandbox", map[string]github_com_containerd_ttrpc.Method{ + srv.Register("containerd.runtime.sandbox.v1.Sandbox", map[string]github_com_containerd_ttrpc.Method{ "StartSandbox": func(ctx context.Context, unmarshal func(interface{}) error) (interface{}, error) { var req StartSandboxRequest if err := unmarshal(&req); err != nil { @@ -1957,7 +1958,7 @@ func NewSandboxClient(client *github_com_containerd_ttrpc.Client) SandboxService func (c *sandboxClient) StartSandbox(ctx context.Context, req *StartSandboxRequest) (*StartSandboxResponse, error) { var resp StartSandboxResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "StartSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "StartSandbox", req, &resp); err != nil { return nil, err } return &resp, nil @@ -1965,7 +1966,7 @@ func (c *sandboxClient) StartSandbox(ctx context.Context, req *StartSandboxReque func (c *sandboxClient) StopSandbox(ctx context.Context, req *StopSandboxRequest) (*StopSandboxResponse, error) { var resp StopSandboxResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "StopSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "StopSandbox", req, &resp); err != nil { return nil, err } return &resp, nil @@ -1973,7 +1974,7 @@ func (c *sandboxClient) StopSandbox(ctx context.Context, req *StopSandboxRequest func (c *sandboxClient) WaitSandbox(ctx context.Context, req *WaitSandboxRequest) (*WaitSandboxResponse, error) { var resp WaitSandboxResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "WaitSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "WaitSandbox", req, &resp); err != nil { return nil, err } return &resp, nil @@ -1981,7 +1982,7 @@ func (c *sandboxClient) WaitSandbox(ctx context.Context, req *WaitSandboxRequest func (c *sandboxClient) UpdateSandbox(ctx context.Context, req *UpdateSandboxRequest) (*UpdateSandboxResponse, error) { var resp UpdateSandboxResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "UpdateSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "UpdateSandbox", req, &resp); err != nil { return nil, err } return &resp, nil @@ -1989,7 +1990,7 @@ func (c *sandboxClient) UpdateSandbox(ctx context.Context, req *UpdateSandboxReq func (c *sandboxClient) PauseSandbox(ctx context.Context, req *PauseSandboxRequest) (*PauseSandboxResponse, error) { var resp PauseSandboxResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "PauseSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "PauseSandbox", req, &resp); err != nil { return nil, err } return &resp, nil @@ -1997,7 +1998,7 @@ func (c *sandboxClient) PauseSandbox(ctx context.Context, req *PauseSandboxReque func (c *sandboxClient) ResumeSandbox(ctx context.Context, req *ResumeSandboxRequest) (*ResumeSandboxResponse, error) { var resp ResumeSandboxResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "ResumeSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "ResumeSandbox", req, &resp); err != nil { return nil, err } return &resp, nil @@ -2005,7 +2006,7 @@ func (c *sandboxClient) ResumeSandbox(ctx context.Context, req *ResumeSandboxReq func (c *sandboxClient) SandboxStatus(ctx context.Context, req *SandboxStatusRequest) (*SandboxStatusResponse, error) { var resp SandboxStatusResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "SandboxStatus", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "SandboxStatus", req, &resp); err != nil { return nil, err } return &resp, nil @@ -2013,7 +2014,7 @@ func (c *sandboxClient) SandboxStatus(ctx context.Context, req *SandboxStatusReq func (c *sandboxClient) PingSandbox(ctx context.Context, req *PingRequest) (*PingResponse, error) { var resp PingResponse - if err := c.client.Call(ctx, "containerd.task.v2.Sandbox", "PingSandbox", req, &resp); err != nil { + if err := c.client.Call(ctx, "containerd.runtime.sandbox.v1.Sandbox", "PingSandbox", req, &resp); err != nil { return nil, err } return &resp, nil diff --git a/runtime/v2/task/sandbox.proto b/api/runtime/sandbox/v1/sandbox.proto similarity index 96% rename from runtime/v2/task/sandbox.proto rename to api/runtime/sandbox/v1/sandbox.proto index 096482187..b232d9e96 100644 --- a/runtime/v2/task/sandbox.proto +++ b/api/runtime/sandbox/v1/sandbox.proto @@ -16,7 +16,7 @@ syntax = "proto3"; -package containerd.task.v2; +package containerd.runtime.sandbox.v1; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; @@ -24,6 +24,8 @@ import weak "gogoproto/gogo.proto"; import "github.com/containerd/containerd/api/types/mount.proto"; +option go_package = "github.com/containerd/containerd/api/runtime/sandbox/v1;sandbox"; + // 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. diff --git a/runtime/v2/task/doc.go b/api/runtime/task/v2/doc.go similarity index 100% rename from runtime/v2/task/doc.go rename to api/runtime/task/v2/doc.go diff --git a/runtime/v2/task/shim.pb.go b/api/runtime/task/v2/shim.pb.go similarity index 95% rename from runtime/v2/task/shim.pb.go rename to api/runtime/task/v2/shim.pb.go index 8ab8995ab..a44ebce89 100644 --- a/runtime/v2/task/shim.pb.go +++ b/api/runtime/task/v2/shim.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/containerd/containerd/runtime/v2/task/shim.proto +// source: github.com/containerd/containerd/api/runtime/task/v2/shim.proto package task @@ -50,7 +50,7 @@ type CreateTaskRequest struct { func (m *CreateTaskRequest) Reset() { *m = CreateTaskRequest{} } func (*CreateTaskRequest) ProtoMessage() {} func (*CreateTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{0} + return fileDescriptor_776a86a4acdacc3f, []int{0} } func (m *CreateTaskRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -89,7 +89,7 @@ type CreateTaskResponse struct { func (m *CreateTaskResponse) Reset() { *m = CreateTaskResponse{} } func (*CreateTaskResponse) ProtoMessage() {} func (*CreateTaskResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{1} + return fileDescriptor_776a86a4acdacc3f, []int{1} } func (m *CreateTaskResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -129,7 +129,7 @@ type DeleteRequest struct { func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{2} + return fileDescriptor_776a86a4acdacc3f, []int{2} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -170,7 +170,7 @@ type DeleteResponse struct { func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{3} + return fileDescriptor_776a86a4acdacc3f, []int{3} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -215,7 +215,7 @@ type ExecProcessRequest struct { func (m *ExecProcessRequest) Reset() { *m = ExecProcessRequest{} } func (*ExecProcessRequest) ProtoMessage() {} func (*ExecProcessRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{4} + return fileDescriptor_776a86a4acdacc3f, []int{4} } func (m *ExecProcessRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -253,7 +253,7 @@ type ExecProcessResponse struct { func (m *ExecProcessResponse) Reset() { *m = ExecProcessResponse{} } func (*ExecProcessResponse) ProtoMessage() {} func (*ExecProcessResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{5} + return fileDescriptor_776a86a4acdacc3f, []int{5} } func (m *ExecProcessResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -295,7 +295,7 @@ type ResizePtyRequest struct { func (m *ResizePtyRequest) Reset() { *m = ResizePtyRequest{} } func (*ResizePtyRequest) ProtoMessage() {} func (*ResizePtyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{6} + return fileDescriptor_776a86a4acdacc3f, []int{6} } func (m *ResizePtyRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -335,7 +335,7 @@ type StateRequest struct { func (m *StateRequest) Reset() { *m = StateRequest{} } func (*StateRequest) ProtoMessage() {} func (*StateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{7} + return fileDescriptor_776a86a4acdacc3f, []int{7} } func (m *StateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -384,7 +384,7 @@ type StateResponse struct { func (m *StateResponse) Reset() { *m = StateResponse{} } func (*StateResponse) ProtoMessage() {} func (*StateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{8} + return fileDescriptor_776a86a4acdacc3f, []int{8} } func (m *StateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -426,7 +426,7 @@ type KillRequest struct { func (m *KillRequest) Reset() { *m = KillRequest{} } func (*KillRequest) ProtoMessage() {} func (*KillRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{9} + return fileDescriptor_776a86a4acdacc3f, []int{9} } func (m *KillRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,7 +467,7 @@ type CloseIORequest struct { func (m *CloseIORequest) Reset() { *m = CloseIORequest{} } func (*CloseIORequest) ProtoMessage() {} func (*CloseIORequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{10} + return fileDescriptor_776a86a4acdacc3f, []int{10} } func (m *CloseIORequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -506,7 +506,7 @@ type PidsRequest struct { func (m *PidsRequest) Reset() { *m = PidsRequest{} } func (*PidsRequest) ProtoMessage() {} func (*PidsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{11} + return fileDescriptor_776a86a4acdacc3f, []int{11} } func (m *PidsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -545,7 +545,7 @@ type PidsResponse struct { func (m *PidsResponse) Reset() { *m = PidsResponse{} } func (*PidsResponse) ProtoMessage() {} func (*PidsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{12} + return fileDescriptor_776a86a4acdacc3f, []int{12} } func (m *PidsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -586,7 +586,7 @@ type CheckpointTaskRequest struct { func (m *CheckpointTaskRequest) Reset() { *m = CheckpointTaskRequest{} } func (*CheckpointTaskRequest) ProtoMessage() {} func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{13} + return fileDescriptor_776a86a4acdacc3f, []int{13} } func (m *CheckpointTaskRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +627,7 @@ type UpdateTaskRequest struct { func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } func (*UpdateTaskRequest) ProtoMessage() {} func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{14} + return fileDescriptor_776a86a4acdacc3f, []int{14} } func (m *UpdateTaskRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -667,7 +667,7 @@ type StartRequest struct { func (m *StartRequest) Reset() { *m = StartRequest{} } func (*StartRequest) ProtoMessage() {} func (*StartRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{15} + return fileDescriptor_776a86a4acdacc3f, []int{15} } func (m *StartRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -706,7 +706,7 @@ type StartResponse struct { func (m *StartResponse) Reset() { *m = StartResponse{} } func (*StartResponse) ProtoMessage() {} func (*StartResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{16} + return fileDescriptor_776a86a4acdacc3f, []int{16} } func (m *StartResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -746,7 +746,7 @@ type WaitRequest struct { func (m *WaitRequest) Reset() { *m = WaitRequest{} } func (*WaitRequest) ProtoMessage() {} func (*WaitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{17} + return fileDescriptor_776a86a4acdacc3f, []int{17} } func (m *WaitRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -786,7 +786,7 @@ type WaitResponse struct { func (m *WaitResponse) Reset() { *m = WaitResponse{} } func (*WaitResponse) ProtoMessage() {} func (*WaitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{18} + return fileDescriptor_776a86a4acdacc3f, []int{18} } func (m *WaitResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -825,7 +825,7 @@ type StatsRequest struct { func (m *StatsRequest) Reset() { *m = StatsRequest{} } func (*StatsRequest) ProtoMessage() {} func (*StatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{19} + return fileDescriptor_776a86a4acdacc3f, []int{19} } func (m *StatsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -864,7 +864,7 @@ type StatsResponse struct { func (m *StatsResponse) Reset() { *m = StatsResponse{} } func (*StatsResponse) ProtoMessage() {} func (*StatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{20} + return fileDescriptor_776a86a4acdacc3f, []int{20} } func (m *StatsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -903,7 +903,7 @@ type ConnectRequest struct { func (m *ConnectRequest) Reset() { *m = ConnectRequest{} } func (*ConnectRequest) ProtoMessage() {} func (*ConnectRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{21} + return fileDescriptor_776a86a4acdacc3f, []int{21} } func (m *ConnectRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -944,7 +944,7 @@ type ConnectResponse struct { func (m *ConnectResponse) Reset() { *m = ConnectResponse{} } func (*ConnectResponse) ProtoMessage() {} func (*ConnectResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{22} + return fileDescriptor_776a86a4acdacc3f, []int{22} } func (m *ConnectResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -984,7 +984,7 @@ type ShutdownRequest struct { func (m *ShutdownRequest) Reset() { *m = ShutdownRequest{} } func (*ShutdownRequest) ProtoMessage() {} func (*ShutdownRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{23} + return fileDescriptor_776a86a4acdacc3f, []int{23} } func (m *ShutdownRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1023,7 +1023,7 @@ type PauseRequest struct { func (m *PauseRequest) Reset() { *m = PauseRequest{} } func (*PauseRequest) ProtoMessage() {} func (*PauseRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{24} + return fileDescriptor_776a86a4acdacc3f, []int{24} } func (m *PauseRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1062,7 +1062,7 @@ type ResumeRequest struct { func (m *ResumeRequest) Reset() { *m = ResumeRequest{} } func (*ResumeRequest) ProtoMessage() {} func (*ResumeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9202ee34bc3ad8ca, []int{25} + return fileDescriptor_776a86a4acdacc3f, []int{25} } func (m *ResumeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1122,92 +1122,92 @@ func init() { } func init() { - proto.RegisterFile("github.com/containerd/containerd/runtime/v2/task/shim.proto", fileDescriptor_9202ee34bc3ad8ca) + proto.RegisterFile("github.com/containerd/containerd/api/runtime/task/v2/shim.proto", fileDescriptor_776a86a4acdacc3f) } -var fileDescriptor_9202ee34bc3ad8ca = []byte{ - // 1289 bytes of a gzipped FileDescriptorProto +var fileDescriptor_776a86a4acdacc3f = []byte{ + // 1290 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4d, 0x6f, 0xdb, 0x46, 0x13, 0x0e, 0xf5, 0x41, 0x49, 0xa3, 0xc8, 0x71, 0xf6, 0x75, 0xf2, 0x32, 0x0a, 0x20, 0x2b, 0x4c, - 0x93, 0xaa, 0x2d, 0x40, 0xa1, 0x0a, 0x9a, 0x16, 0x31, 0x90, 0xc2, 0xb1, 0xdd, 0x40, 0x4d, 0x5a, - 0x1b, 0x4c, 0x8a, 0x14, 0xbd, 0x18, 0xb4, 0xb8, 0x96, 0x08, 0x4b, 0x5c, 0x96, 0xbb, 0xb4, 0xad, + 0x93, 0xaa, 0x2d, 0x40, 0xa1, 0x0a, 0x90, 0xb6, 0x09, 0x90, 0xc0, 0x71, 0xdc, 0x40, 0x4d, 0x5a, + 0x1b, 0x74, 0x8a, 0x14, 0xbd, 0x18, 0xb4, 0xb8, 0x96, 0x08, 0x4b, 0x5c, 0x96, 0xbb, 0xb4, 0xad, 0xa2, 0x05, 0x7a, 0xee, 0x2f, 0xcb, 0xb1, 0x40, 0x2f, 0xbd, 0x34, 0x68, 0x74, 0xe9, 0x6f, 0xe8, - 0xad, 0xd8, 0x0f, 0x59, 0x94, 0x44, 0x4a, 0x36, 0xa0, 0x8b, 0xb1, 0xcb, 0x7d, 0x76, 0x76, 0x67, - 0xf6, 0x99, 0x67, 0xc6, 0x82, 0xad, 0xae, 0xc7, 0x7a, 0xd1, 0x91, 0xd5, 0x21, 0x83, 0x66, 0x87, - 0xf8, 0xcc, 0xf1, 0x7c, 0x1c, 0xba, 0xf1, 0x61, 0x18, 0xf9, 0xcc, 0x1b, 0xe0, 0xe6, 0x69, 0xab, - 0xc9, 0x1c, 0x7a, 0xd2, 0xa4, 0x3d, 0x6f, 0x60, 0x05, 0x21, 0x61, 0x04, 0xa1, 0x09, 0xcc, 0xe2, - 0x6b, 0xd6, 0x69, 0xab, 0x7a, 0xa7, 0x4b, 0x48, 0xb7, 0x8f, 0x9b, 0x02, 0x71, 0x14, 0x1d, 0x37, - 0x1d, 0x7f, 0x28, 0xe1, 0xd5, 0xbb, 0xb3, 0x4b, 0x78, 0x10, 0xb0, 0xf1, 0xe2, 0x46, 0x97, 0x74, - 0x89, 0x18, 0x36, 0xf9, 0x48, 0x7d, 0xdd, 0x9c, 0xdd, 0xc2, 0xaf, 0x42, 0x99, 0x33, 0x08, 0x14, - 0xe0, 0xf1, 0xd2, 0xfb, 0x3b, 0x81, 0xd7, 0x64, 0xc3, 0x00, 0xd3, 0xe6, 0x80, 0x44, 0x3e, 0x53, - 0xfb, 0x9e, 0x5c, 0x61, 0x9f, 0x70, 0x5b, 0xf8, 0x27, 0xf6, 0x9a, 0x7f, 0x64, 0xe0, 0xe6, 0x4e, - 0x88, 0x1d, 0x86, 0x5f, 0x3b, 0xf4, 0xc4, 0xc6, 0x3f, 0x46, 0x98, 0x32, 0x74, 0x1b, 0x32, 0x9e, - 0x6b, 0x68, 0x75, 0xad, 0x51, 0x7a, 0xa6, 0x8f, 0xde, 0x6d, 0x66, 0xda, 0xbb, 0x76, 0xc6, 0x73, - 0xd1, 0x6d, 0xd0, 0x8f, 0x22, 0xdf, 0xed, 0x63, 0x23, 0xc3, 0xd7, 0x6c, 0x35, 0x43, 0x4d, 0xd0, - 0x43, 0x42, 0xd8, 0x31, 0x35, 0xb2, 0xf5, 0x6c, 0xa3, 0xdc, 0xfa, 0xbf, 0x15, 0x8f, 0x26, 0x3f, - 0xd8, 0xfa, 0x86, 0x5f, 0xd8, 0x56, 0x30, 0x54, 0x85, 0x22, 0xc3, 0xe1, 0xc0, 0xf3, 0x9d, 0xbe, - 0x91, 0xab, 0x6b, 0x8d, 0xa2, 0x7d, 0x31, 0x47, 0x1b, 0x90, 0xa7, 0xcc, 0xf5, 0x7c, 0x23, 0x2f, + 0xad, 0xd8, 0x0f, 0x59, 0x94, 0x44, 0x4a, 0x76, 0xa1, 0x93, 0x77, 0xb9, 0xcf, 0xce, 0xee, 0xcc, + 0x3e, 0xf3, 0xcc, 0x58, 0xf0, 0xb4, 0xeb, 0xb1, 0x5e, 0x74, 0x68, 0x75, 0xc8, 0xa0, 0xd9, 0x21, + 0x3e, 0x73, 0x3c, 0x1f, 0x87, 0x6e, 0x7c, 0xe8, 0x04, 0x5e, 0x33, 0x8c, 0x7c, 0xe6, 0x0d, 0x70, + 0x93, 0x39, 0xf4, 0xb8, 0x79, 0xd2, 0x6a, 0xd2, 0x9e, 0x37, 0xb0, 0x82, 0x90, 0x30, 0x82, 0xd0, + 0x04, 0x6a, 0xf1, 0x65, 0xeb, 0xa4, 0x55, 0xbd, 0xd5, 0x25, 0xa4, 0xdb, 0xc7, 0x4d, 0x81, 0x38, + 0x8c, 0x8e, 0x9a, 0x8e, 0x3f, 0x94, 0xf0, 0xea, 0xed, 0xd9, 0x25, 0x3c, 0x08, 0xd8, 0x78, 0x71, + 0xa3, 0x4b, 0xba, 0x44, 0x0c, 0x9b, 0x7c, 0xa4, 0xbe, 0x6e, 0xce, 0x6e, 0xe1, 0x57, 0xa1, 0xcc, + 0x19, 0x04, 0x0a, 0xf0, 0xf0, 0x42, 0x3e, 0xb0, 0x61, 0x80, 0x69, 0x73, 0x40, 0x22, 0x9f, 0xa9, + 0x7d, 0x8f, 0x2e, 0xb1, 0x4f, 0x78, 0x2e, 0xfc, 0x13, 0x7b, 0xcd, 0xdf, 0x33, 0x70, 0x7d, 0x3b, + 0xc4, 0x0e, 0xc3, 0xaf, 0x1d, 0x7a, 0x6c, 0xe3, 0x1f, 0x22, 0x4c, 0x19, 0xba, 0x09, 0x19, 0xcf, + 0x35, 0xb4, 0xba, 0xd6, 0x28, 0x3d, 0xd3, 0x47, 0xef, 0x36, 0x33, 0xed, 0xe7, 0x76, 0xc6, 0x73, + 0xd1, 0x4d, 0xd0, 0x0f, 0x23, 0xdf, 0xed, 0x63, 0x23, 0xc3, 0xd7, 0x6c, 0x35, 0x43, 0x4d, 0xd0, + 0x43, 0x42, 0xd8, 0x11, 0x35, 0xb2, 0xf5, 0x6c, 0xa3, 0xdc, 0xfa, 0xbf, 0x15, 0x8f, 0x26, 0x3f, + 0xd8, 0xfa, 0x9a, 0x5f, 0xd8, 0x56, 0x30, 0x54, 0x85, 0x22, 0xc3, 0xe1, 0xc0, 0xf3, 0x9d, 0xbe, + 0x91, 0xab, 0x6b, 0x8d, 0xa2, 0x7d, 0x3e, 0x47, 0x1b, 0x90, 0xa7, 0xcc, 0xf5, 0x7c, 0x23, 0x2f, 0xce, 0x90, 0x13, 0x7e, 0x34, 0x65, 0x2e, 0x89, 0x98, 0xa1, 0xcb, 0xa3, 0xe5, 0x4c, 0x7d, 0xc7, - 0x61, 0x68, 0x14, 0x2e, 0xbe, 0xe3, 0x30, 0x44, 0x35, 0x80, 0x4e, 0x0f, 0x77, 0x4e, 0x02, 0xe2, - 0xf9, 0xcc, 0x28, 0x8a, 0xb5, 0xd8, 0x17, 0xf4, 0x09, 0xdc, 0x0c, 0x9c, 0x10, 0xfb, 0xec, 0x30, - 0x06, 0x2b, 0x09, 0xd8, 0xba, 0x5c, 0xd8, 0x99, 0x80, 0x2d, 0x28, 0x90, 0x80, 0x79, 0xc4, 0xa7, - 0x06, 0xd4, 0xb5, 0x46, 0xb9, 0xb5, 0x61, 0xc9, 0xc7, 0xb4, 0xc6, 0x8f, 0x69, 0x6d, 0xfb, 0x43, - 0x7b, 0x0c, 0x32, 0x1f, 0x02, 0x8a, 0x07, 0x95, 0x06, 0xc4, 0xa7, 0x18, 0xad, 0x43, 0x36, 0x50, - 0x61, 0xad, 0xd8, 0x7c, 0x68, 0xbe, 0x84, 0xca, 0x2e, 0xee, 0x63, 0x86, 0x97, 0x05, 0xfe, 0x3e, - 0x14, 0xf0, 0x39, 0xee, 0x1c, 0x7a, 0xae, 0x8c, 0xfc, 0x33, 0x18, 0xbd, 0xdb, 0xd4, 0xf7, 0xce, - 0x71, 0xa7, 0xbd, 0x6b, 0xeb, 0x7c, 0xa9, 0xed, 0x9a, 0x3f, 0xc3, 0xda, 0xd8, 0x5a, 0xda, 0x89, - 0x68, 0x13, 0xca, 0xf8, 0xdc, 0x63, 0x87, 0x94, 0x39, 0x2c, 0xa2, 0xc2, 0x58, 0xc5, 0x06, 0xfe, - 0xe9, 0x95, 0xf8, 0x82, 0x3e, 0x87, 0x12, 0x9f, 0x61, 0xf7, 0xd0, 0x61, 0x46, 0x56, 0x38, 0x5b, - 0x9d, 0x73, 0xf6, 0xf5, 0x98, 0xb9, 0x76, 0x51, 0x82, 0xb7, 0x99, 0xf9, 0x97, 0x06, 0x88, 0x5f, - 0xe8, 0x20, 0x24, 0x1d, 0x4c, 0xe9, 0x2a, 0x3c, 0x9a, 0xa2, 0x49, 0x36, 0x8d, 0x26, 0xb9, 0x64, - 0x9a, 0xe4, 0x53, 0x68, 0xa2, 0x4f, 0xd1, 0xa4, 0x01, 0x39, 0x1a, 0xe0, 0x8e, 0x20, 0x4f, 0xda, - 0xb3, 0x0a, 0x84, 0x79, 0x0b, 0xfe, 0x37, 0xe5, 0x9e, 0x0c, 0xb1, 0xf9, 0x0b, 0xac, 0xdb, 0x98, - 0x7a, 0x3f, 0xe1, 0x03, 0x36, 0x5c, 0x89, 0xcf, 0x1b, 0x90, 0x3f, 0xf3, 0x5c, 0xd6, 0x13, 0x0e, - 0x57, 0x6c, 0x39, 0xe1, 0xf7, 0xef, 0x61, 0xaf, 0xdb, 0x63, 0xc2, 0xdd, 0x8a, 0xad, 0x66, 0xe6, - 0x0b, 0xb8, 0xce, 0x1f, 0x6e, 0x35, 0x04, 0xfa, 0x27, 0x03, 0x15, 0x65, 0x4d, 0x11, 0xe8, 0xaa, - 0x42, 0xa0, 0x08, 0x97, 0x9d, 0x10, 0xee, 0x11, 0x0f, 0xbc, 0xe0, 0x1a, 0xbf, 0xf8, 0x5a, 0xeb, - 0x6e, 0x5c, 0x1a, 0x4e, 0x3f, 0x55, 0xea, 0x20, 0xc9, 0x67, 0x2b, 0xe8, 0x8a, 0x24, 0x20, 0xce, - 0x9e, 0xe2, 0x0c, 0x7b, 0x66, 0xf2, 0xa0, 0xb4, 0x38, 0x0f, 0xe0, 0xf2, 0x79, 0x10, 0x8f, 0x74, - 0x39, 0x35, 0xd2, 0x0c, 0xca, 0x2f, 0xbc, 0x7e, 0x7f, 0x25, 0x84, 0xe1, 0xee, 0x7b, 0xdd, 0x71, - 0x8a, 0x54, 0x6c, 0x35, 0xe3, 0x6f, 0xe1, 0xf4, 0xc7, 0xf2, 0xca, 0x87, 0x66, 0x07, 0xd6, 0x76, - 0xfa, 0x84, 0xe2, 0xf6, 0xfe, 0xaa, 0x98, 0x2a, 0x5f, 0x49, 0xa6, 0xa6, 0x9c, 0x98, 0x0f, 0xa0, - 0x7c, 0xe0, 0xb9, 0xcb, 0xf2, 0xdf, 0xfc, 0x16, 0xae, 0x4b, 0x98, 0x62, 0xda, 0x53, 0x28, 0x05, - 0x32, 0xb5, 0x30, 0x35, 0x34, 0x51, 0x45, 0xea, 0x89, 0x54, 0x51, 0x09, 0xd8, 0xf6, 0x8f, 0x89, - 0x3d, 0xd9, 0x62, 0x52, 0xb8, 0x35, 0x11, 0xec, 0xcb, 0xd4, 0x32, 0x04, 0xb9, 0xc0, 0x61, 0x3d, - 0x45, 0x60, 0x31, 0x8e, 0xeb, 0x7c, 0xf6, 0x32, 0x3a, 0xff, 0xaf, 0x06, 0x37, 0xbf, 0x0b, 0xdc, - 0x4b, 0x56, 0xcf, 0x16, 0x94, 0x42, 0x4c, 0x49, 0x14, 0x76, 0xb0, 0x54, 0xde, 0x34, 0xfb, 0x13, - 0x18, 0xfa, 0x1e, 0xca, 0x8e, 0xef, 0x13, 0xe6, 0x8c, 0x6f, 0xc5, 0x03, 0xf3, 0xd8, 0x9a, 0x6f, - 0x56, 0xac, 0xb9, 0x7b, 0x58, 0xdb, 0x93, 0x8d, 0x7b, 0x3e, 0x0b, 0x87, 0x76, 0xdc, 0x54, 0xf5, - 0x29, 0xac, 0xcf, 0x02, 0x38, 0x65, 0x4e, 0xf0, 0x50, 0x5e, 0xdd, 0xe6, 0x43, 0xfe, 0xc6, 0xa7, - 0x4e, 0x3f, 0x1a, 0xe7, 0xb9, 0x9c, 0x3c, 0xc9, 0x7c, 0xa1, 0x29, 0xe5, 0x09, 0xd9, 0x4a, 0x94, - 0xe7, 0x9e, 0x10, 0x1e, 0x6e, 0x2c, 0xb5, 0x56, 0x7e, 0x0d, 0xe5, 0x37, 0x8e, 0xb7, 0x9a, 0xe3, - 0x7a, 0x70, 0x5d, 0xda, 0x52, 0xa7, 0xcd, 0xa8, 0x81, 0xb6, 0x58, 0x0d, 0x32, 0x57, 0xa8, 0x8a, - 0x0f, 0xa5, 0x3e, 0x2f, 0x4d, 0x87, 0x2d, 0xa9, 0xbc, 0x93, 0x7c, 0xf8, 0x98, 0x27, 0x97, 0xc3, - 0xe4, 0x65, 0xd2, 0x88, 0x22, 0x21, 0x66, 0x03, 0xd6, 0x76, 0x88, 0xef, 0xe3, 0xce, 0xb2, 0xe8, - 0x98, 0x0e, 0xdc, 0xb8, 0x40, 0xaa, 0x83, 0xee, 0x40, 0x91, 0xb7, 0xc1, 0x87, 0x93, 0x70, 0x17, - 0xf8, 0xfc, 0xc0, 0x73, 0xf9, 0x12, 0x67, 0x97, 0x58, 0x92, 0x9d, 0x42, 0x81, 0xcf, 0xf9, 0x92, - 0x01, 0x85, 0x53, 0x1c, 0x52, 0x8f, 0xc8, 0xec, 0x2f, 0xd9, 0xe3, 0xa9, 0xb9, 0x05, 0x37, 0x5e, - 0xf5, 0x22, 0xe6, 0x92, 0x33, 0x7f, 0xd9, 0x5b, 0xad, 0x43, 0xd6, 0x27, 0x67, 0xc2, 0x74, 0xd1, - 0xe6, 0x43, 0x1e, 0xae, 0x03, 0x27, 0xa2, 0xcb, 0xca, 0x99, 0xf9, 0x21, 0x54, 0x6c, 0x4c, 0xa3, - 0xc1, 0x32, 0x60, 0xeb, 0x37, 0x80, 0x1c, 0xcf, 0x09, 0xf4, 0x12, 0xf2, 0xa2, 0xb4, 0xa1, 0x7a, - 0x52, 0xf2, 0xc4, 0x6b, 0x68, 0xf5, 0xde, 0x02, 0x84, 0x0a, 0xda, 0x1b, 0xd0, 0x65, 0x83, 0x87, - 0x1e, 0x24, 0x81, 0xe7, 0x3a, 0xea, 0xea, 0xc3, 0x65, 0x30, 0x65, 0x58, 0x5e, 0x33, 0x64, 0xa9, - 0xd7, 0xbc, 0x48, 0xb8, 0xd4, 0x6b, 0xc6, 0xb2, 0x68, 0x1f, 0x74, 0xd9, 0x11, 0xa2, 0x44, 0xf0, - 0x54, 0xef, 0x59, 0x35, 0x17, 0x41, 0x94, 0xc1, 0x36, 0xe4, 0xb8, 0x6a, 0xa3, 0xcd, 0x24, 0x6c, - 0x4c, 0xf6, 0xab, 0xf5, 0x74, 0x80, 0x32, 0xb5, 0x0d, 0x79, 0xf1, 0xd4, 0xc9, 0x9e, 0xc6, 0x59, - 0x50, 0xbd, 0x3d, 0x47, 0xfe, 0x3d, 0xfe, 0xdf, 0x16, 0xda, 0x01, 0x5d, 0xb2, 0x20, 0xd9, 0xbd, - 0x29, 0x86, 0xa4, 0x1a, 0xd9, 0x07, 0x88, 0x75, 0xfa, 0x1f, 0x25, 0xbe, 0x53, 0x52, 0x61, 0x49, - 0x35, 0xf8, 0x25, 0xe4, 0x78, 0x6d, 0x4f, 0x8e, 0x51, 0xac, 0xea, 0xa7, 0x1a, 0xf8, 0x0a, 0x72, - 0x5c, 0xaf, 0x50, 0x22, 0x67, 0xe6, 0x5b, 0xec, 0x54, 0x3b, 0x6d, 0x28, 0x5d, 0xb4, 0xa6, 0xe8, - 0x83, 0x94, 0x08, 0x4d, 0x75, 0xae, 0xa9, 0xa6, 0xf6, 0xa0, 0xa0, 0x3a, 0x07, 0x94, 0x48, 0x93, - 0xe9, 0xb6, 0x22, 0xd5, 0xcc, 0x73, 0xd0, 0x65, 0x99, 0x4a, 0x4e, 0x9b, 0xb9, 0x12, 0xb6, 0xc0, - 0xb5, 0x1c, 0x17, 0xf0, 0xe4, 0x18, 0xc7, 0xca, 0x44, 0x32, 0x0f, 0xa7, 0xb4, 0x5f, 0x09, 0x03, - 0x4d, 0x17, 0x06, 0xba, 0x54, 0x18, 0x26, 0xac, 0xb6, 0xa1, 0xa0, 0x04, 0x36, 0x25, 0x50, 0x53, - 0x3a, 0x5d, 0xbd, 0xbf, 0x10, 0xa3, 0x6c, 0x3e, 0x87, 0xe2, 0x58, 0x51, 0x51, 0xe2, 0x86, 0x19, - 0xbd, 0x4d, 0x8b, 0xda, 0xb3, 0xfd, 0xb7, 0xef, 0x6b, 0xd7, 0xfe, 0x7c, 0x5f, 0xbb, 0xf6, 0xeb, - 0xa8, 0xa6, 0xbd, 0x1d, 0xd5, 0xb4, 0xdf, 0x47, 0x35, 0xed, 0xef, 0x51, 0x4d, 0xfb, 0xe1, 0xb3, - 0xab, 0xfe, 0x74, 0xb2, 0xc5, 0xff, 0x1c, 0xe9, 0xe2, 0x80, 0x47, 0xff, 0x05, 0x00, 0x00, 0xff, - 0xff, 0x2b, 0x56, 0x99, 0xb9, 0x7a, 0x11, 0x00, 0x00, + 0x61, 0x68, 0x14, 0xce, 0xbf, 0xe3, 0x30, 0x44, 0x35, 0x80, 0x4e, 0x0f, 0x77, 0x8e, 0x03, 0xe2, + 0xf9, 0xcc, 0x28, 0x8a, 0xb5, 0xd8, 0x17, 0xf4, 0x09, 0x5c, 0x0f, 0x9c, 0x10, 0xfb, 0xec, 0x20, + 0x06, 0x2b, 0x09, 0xd8, 0xba, 0x5c, 0xd8, 0x9e, 0x80, 0x2d, 0x28, 0x90, 0x80, 0x79, 0xc4, 0xa7, + 0x06, 0xd4, 0xb5, 0x46, 0xb9, 0xb5, 0x61, 0xc9, 0xc7, 0xb4, 0xc6, 0x8f, 0x69, 0x6d, 0xf9, 0x43, + 0x7b, 0x0c, 0x32, 0xef, 0x03, 0x8a, 0x07, 0x95, 0x06, 0xc4, 0xa7, 0x18, 0xad, 0x43, 0x36, 0x50, + 0x61, 0xad, 0xd8, 0x7c, 0x68, 0xbe, 0x82, 0xca, 0x73, 0xdc, 0xc7, 0x0c, 0x2f, 0x0b, 0xfc, 0x5d, + 0x28, 0xe0, 0x33, 0xdc, 0x39, 0xf0, 0x5c, 0x19, 0xf9, 0x67, 0x30, 0x7a, 0xb7, 0xa9, 0xef, 0x9c, + 0xe1, 0x4e, 0xfb, 0xb9, 0xad, 0xf3, 0xa5, 0xb6, 0x6b, 0xfe, 0x04, 0x6b, 0x63, 0x6b, 0x69, 0x27, + 0xa2, 0x4d, 0x28, 0xe3, 0x33, 0x8f, 0x1d, 0x50, 0xe6, 0xb0, 0x88, 0x0a, 0x63, 0x15, 0x1b, 0xf8, + 0xa7, 0x7d, 0xf1, 0x05, 0x7d, 0x06, 0x25, 0x3e, 0xc3, 0xee, 0x81, 0xc3, 0x8c, 0xac, 0x70, 0xb6, + 0x3a, 0xe7, 0xec, 0xeb, 0x31, 0x73, 0xed, 0xa2, 0x04, 0x6f, 0x31, 0xf3, 0x4f, 0x0d, 0x10, 0xbf, + 0xd0, 0x5e, 0x48, 0x3a, 0x98, 0xd2, 0x55, 0x78, 0x34, 0x45, 0x93, 0x6c, 0x1a, 0x4d, 0x72, 0xc9, + 0x34, 0xc9, 0xa7, 0xd0, 0x44, 0x9f, 0xa2, 0x49, 0x03, 0x72, 0x34, 0xc0, 0x1d, 0x41, 0x9e, 0xb4, + 0x67, 0x15, 0x08, 0xf3, 0x06, 0xfc, 0x6f, 0xca, 0x3d, 0x19, 0x62, 0xf3, 0x67, 0x58, 0xb7, 0x31, + 0xf5, 0x7e, 0xc4, 0x7b, 0x6c, 0xb8, 0x12, 0x9f, 0x37, 0x20, 0x7f, 0xea, 0xb9, 0xac, 0x27, 0x1c, + 0xae, 0xd8, 0x72, 0xc2, 0xef, 0xdf, 0xc3, 0x5e, 0xb7, 0xc7, 0x84, 0xbb, 0x15, 0x5b, 0xcd, 0xcc, + 0x97, 0x70, 0x95, 0x3f, 0xdc, 0x6a, 0x08, 0xf4, 0x77, 0x06, 0x2a, 0xca, 0x9a, 0x22, 0xd0, 0x65, + 0x85, 0x40, 0x11, 0x2e, 0x3b, 0x21, 0xdc, 0x03, 0x1e, 0x78, 0xc1, 0x35, 0x7e, 0xf1, 0xb5, 0xd6, + 0xed, 0xb8, 0x34, 0x9c, 0x7c, 0xaa, 0xd4, 0x41, 0x92, 0xcf, 0x56, 0xd0, 0x15, 0x49, 0x40, 0x9c, + 0x3d, 0xc5, 0x19, 0xf6, 0xcc, 0xe4, 0x41, 0x69, 0x71, 0x1e, 0xc0, 0xc5, 0xf3, 0x20, 0x1e, 0xe9, + 0x72, 0x6a, 0xa4, 0x19, 0x94, 0x5f, 0x7a, 0xfd, 0xfe, 0x4a, 0x08, 0xc3, 0xdd, 0xf7, 0xba, 0xe3, + 0x14, 0xa9, 0xd8, 0x6a, 0xc6, 0xdf, 0xc2, 0xe9, 0x8f, 0xe5, 0x95, 0x0f, 0xcd, 0x0e, 0xac, 0x6d, + 0xf7, 0x09, 0xc5, 0xed, 0xdd, 0x55, 0x31, 0x55, 0xbe, 0x92, 0x4c, 0x4d, 0x39, 0x31, 0xef, 0x41, + 0x79, 0xcf, 0x73, 0x97, 0xe5, 0xbf, 0xf9, 0x0d, 0x5c, 0x95, 0x30, 0xc5, 0xb4, 0x27, 0x50, 0x0a, + 0x64, 0x6a, 0x61, 0x6a, 0x68, 0xa2, 0x8a, 0xd4, 0x13, 0xa9, 0xa2, 0x12, 0xb0, 0xed, 0x1f, 0x11, + 0x7b, 0xb2, 0xc5, 0xa4, 0x70, 0x63, 0x22, 0xd8, 0x17, 0xa9, 0x65, 0x08, 0x72, 0x81, 0xc3, 0x7a, + 0x8a, 0xc0, 0x62, 0x1c, 0xd7, 0xf9, 0xec, 0x45, 0x74, 0xfe, 0x1f, 0x0d, 0xae, 0x7f, 0x1b, 0xb8, + 0x17, 0xac, 0x9e, 0x2d, 0x28, 0x85, 0x98, 0x92, 0x28, 0xec, 0x60, 0xa9, 0xbc, 0x69, 0xf6, 0x27, + 0x30, 0xf4, 0x1d, 0x94, 0x1d, 0xdf, 0x27, 0xcc, 0x19, 0xdf, 0x8a, 0x07, 0xe6, 0xa1, 0x35, 0xdf, + 0xac, 0x58, 0x73, 0xf7, 0xb0, 0xb6, 0x26, 0x1b, 0x77, 0x7c, 0x16, 0x0e, 0xed, 0xb8, 0xa9, 0xea, + 0x13, 0x58, 0x9f, 0x05, 0x70, 0xca, 0x1c, 0xe3, 0xa1, 0xbc, 0xba, 0xcd, 0x87, 0xfc, 0x8d, 0x4f, + 0x9c, 0x7e, 0x34, 0xce, 0x73, 0x39, 0x79, 0x94, 0xf9, 0x5c, 0x53, 0xca, 0x13, 0xb2, 0x95, 0x28, + 0xcf, 0x1d, 0x21, 0x3c, 0xdc, 0x58, 0x6a, 0xad, 0xfc, 0x0a, 0xca, 0x6f, 0x1c, 0x6f, 0x35, 0xc7, + 0xf5, 0xe0, 0xaa, 0xb4, 0xa5, 0x4e, 0x9b, 0x51, 0x03, 0x6d, 0xb1, 0x1a, 0x64, 0x2e, 0x51, 0x15, + 0xef, 0x4b, 0x7d, 0x5e, 0x9a, 0x0e, 0x8f, 0xa5, 0xf2, 0x4e, 0xf2, 0xe1, 0x63, 0x9e, 0x5c, 0x0e, + 0x93, 0x97, 0x49, 0x23, 0x8a, 0x84, 0x98, 0x0d, 0x58, 0xdb, 0x26, 0xbe, 0x8f, 0x3b, 0xcb, 0xa2, + 0x63, 0x3a, 0x70, 0xed, 0x1c, 0xa9, 0x0e, 0xba, 0x05, 0x45, 0xde, 0x06, 0x1f, 0x4c, 0xc2, 0x5d, + 0xe0, 0xf3, 0x3d, 0xcf, 0xe5, 0x4b, 0x9c, 0x5d, 0x62, 0x49, 0x76, 0x0a, 0x05, 0x3e, 0xe7, 0x4b, + 0x06, 0x14, 0x4e, 0x70, 0x48, 0x3d, 0x22, 0xb3, 0xbf, 0x64, 0x8f, 0xa7, 0xe6, 0x63, 0xb8, 0xb6, + 0xdf, 0x8b, 0x98, 0x4b, 0x4e, 0xfd, 0x65, 0x6f, 0xb5, 0x0e, 0x59, 0x9f, 0x9c, 0x0a, 0xd3, 0x45, + 0x9b, 0x0f, 0x79, 0xb8, 0xf6, 0x9c, 0x88, 0x2e, 0x2b, 0x67, 0xe6, 0x87, 0x50, 0xb1, 0x31, 0x8d, + 0x06, 0xcb, 0x80, 0xad, 0x5f, 0x01, 0x72, 0x3c, 0x27, 0xd0, 0x2b, 0xc8, 0x8b, 0xd2, 0x86, 0xea, + 0x49, 0xc9, 0x13, 0xaf, 0xa1, 0xd5, 0x3b, 0x0b, 0x10, 0x2a, 0x68, 0x6f, 0x40, 0x97, 0x0d, 0x1e, + 0xba, 0x97, 0x04, 0x9e, 0xeb, 0xa8, 0xab, 0xf7, 0x97, 0xc1, 0x94, 0x61, 0x79, 0xcd, 0x90, 0xa5, + 0x5e, 0xf3, 0x3c, 0xe1, 0x52, 0xaf, 0x19, 0xcb, 0xa2, 0x5d, 0xd0, 0x65, 0x47, 0x88, 0x12, 0xc1, + 0x53, 0xbd, 0x67, 0xd5, 0x5c, 0x04, 0x51, 0x06, 0xdb, 0x90, 0xe3, 0xaa, 0x8d, 0x36, 0x93, 0xb0, + 0x31, 0xd9, 0xaf, 0xd6, 0xd3, 0x01, 0xca, 0xd4, 0x16, 0xe4, 0xc5, 0x53, 0x27, 0x7b, 0x1a, 0x67, + 0x41, 0xf5, 0xe6, 0x1c, 0xf9, 0x77, 0xf8, 0x7f, 0x5b, 0x68, 0x1b, 0x74, 0xc9, 0x82, 0x64, 0xf7, + 0xa6, 0x18, 0x92, 0x6a, 0x64, 0x17, 0x20, 0xd6, 0xe9, 0x7f, 0x94, 0xf8, 0x4e, 0x49, 0x85, 0x25, + 0xd5, 0xe0, 0x53, 0xc8, 0xf1, 0xda, 0x9e, 0x1c, 0xa3, 0x58, 0xd5, 0x4f, 0x35, 0xf0, 0x25, 0xe4, + 0xb8, 0x5e, 0xa1, 0x44, 0xce, 0xcc, 0xb7, 0xd8, 0xa9, 0x76, 0xda, 0x50, 0x3a, 0x6f, 0x4d, 0xd1, + 0x07, 0x29, 0x11, 0x9a, 0xea, 0x5c, 0x53, 0x4d, 0xed, 0x40, 0x41, 0x75, 0x0e, 0x28, 0x91, 0x26, + 0xd3, 0x6d, 0x45, 0xaa, 0x99, 0x17, 0xa0, 0xcb, 0x32, 0x95, 0x9c, 0x36, 0x73, 0x25, 0x6c, 0x81, + 0x6b, 0x39, 0x2e, 0xe0, 0xc9, 0x31, 0x8e, 0x95, 0x89, 0x64, 0x1e, 0x4e, 0x69, 0xbf, 0x12, 0x06, + 0x9a, 0x2e, 0x0c, 0x74, 0xa9, 0x30, 0x4c, 0x58, 0x6d, 0x43, 0x41, 0x09, 0x6c, 0x4a, 0xa0, 0xa6, + 0x74, 0xba, 0x7a, 0x77, 0x21, 0x46, 0xd9, 0x7c, 0x01, 0xc5, 0xb1, 0xa2, 0xa2, 0xc4, 0x0d, 0x33, + 0x7a, 0x9b, 0x16, 0xb5, 0x67, 0xfb, 0x6f, 0xdf, 0xd7, 0xae, 0xfc, 0xf1, 0xbe, 0x76, 0xe5, 0x97, + 0x51, 0x4d, 0x7b, 0x3b, 0xaa, 0x69, 0xbf, 0x8d, 0x6a, 0xda, 0x5f, 0xa3, 0x9a, 0xf6, 0xfd, 0x17, + 0xff, 0xe5, 0xe7, 0x93, 0xc7, 0xfc, 0xef, 0xa1, 0x2e, 0x0e, 0x79, 0xf0, 0x6f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xbb, 0x6e, 0x9c, 0x9e, 0x82, 0x11, 0x00, 0x00, } func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) { diff --git a/runtime/v2/task/shim.proto b/api/runtime/task/v2/shim.proto similarity index 98% rename from runtime/v2/task/shim.proto rename to api/runtime/task/v2/shim.proto index a8b94d7a7..4410e5830 100644 --- a/runtime/v2/task/shim.proto +++ b/api/runtime/task/v2/shim.proto @@ -25,7 +25,7 @@ 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"; +option go_package = "github.com/containerd/containerd/api/runtime/task/v2;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 diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index d7063f056..c4f9e22e7 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -29,11 +29,11 @@ import ( "strings" "github.com/containerd/console" + "github.com/containerd/containerd/api/runtime/task/v2" "github.com/containerd/containerd/cmd/ctr/commands" "github.com/containerd/containerd/namespaces" ptypes "github.com/containerd/containerd/protobuf/types" "github.com/containerd/containerd/runtime/v2/shim" - "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/ttrpc" "github.com/containerd/typeurl" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 104e31ad8..ba5329461 100644 --- a/runtime/v2/binary.go +++ b/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" ) diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go index bffec24a8..c3ab72d9f 100644 --- a/runtime/v2/example/example.go +++ b/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 ( diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 3ff177512..99ee7d16d 100644 --- a/runtime/v2/manager.go +++ b/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" ) diff --git a/runtime/v2/process.go b/runtime/v2/process.go index d1edb8484..e2c9a5c0d 100644 --- a/runtime/v2/process.go +++ b/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" ) diff --git a/runtime/v2/runc/container.go b/runtime/v2/runc/container.go index 52999fe40..eb972ff6b 100644 --- a/runtime/v2/runc/container.go +++ b/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" ) diff --git a/runtime/v2/runc/pause/sandbox.go b/runtime/v2/runc/pause/sandbox.go index 2ef6fc710..ad98b3e0f 100644 --- a/runtime/v2/runc/pause/sandbox.go +++ b/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() { diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go index 11adef04e..4f0a2d358 100644 --- a/runtime/v2/runc/task/service.go +++ b/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 } diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go index 6f01c857b..ee959de6b 100644 --- a/runtime/v2/runc/v1/service.go +++ b/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" diff --git a/runtime/v2/runc/v2/service.go b/runtime/v2/runc/v2/service.go index 67d860c6c..db2625473 100644 --- a/runtime/v2/runc/v2/service.go +++ b/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 diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index 8c8f7e8c5..b0e59c084 100644 --- a/runtime/v2/shim.go +++ b/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" diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 5378c15fb..81c2acdcd 100644 --- a/runtime/v2/shim/shim.go +++ b/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" diff --git a/services/sandbox/controller_local.go b/services/sandbox/controller_local.go index a4b62088c..5df792f40 100644 --- a/services/sandbox/controller_local.go +++ b/services/sandbox/controller_local.go @@ -20,6 +20,7 @@ import ( "context" "fmt" + runtimeAPI "github.com/containerd/containerd/api/runtime/sandbox/v1" api "github.com/containerd/containerd/api/services/sandbox/v1" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/events" @@ -28,8 +29,6 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime" v2 "github.com/containerd/containerd/runtime/v2" - "github.com/containerd/containerd/runtime/v2/task" - proto "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sandbox" "github.com/containerd/containerd/services" "google.golang.org/grpc" @@ -105,9 +104,9 @@ func (c *controllerLocal) Start(ctx context.Context, in *api.ControllerStartRequ return nil, fmt.Errorf("failed to start new sandbox: %w", err) } - svc := task.NewSandboxClient(shim.Client()) + svc := runtimeAPI.NewSandboxClient(shim.Client()) - resp, err := svc.StartSandbox(ctx, &proto.StartSandboxRequest{ + resp, err := svc.StartSandbox(ctx, &runtimeAPI.StartSandboxRequest{ SandboxID: in.SandboxID, BundlePath: shim.Bundle(), Rootfs: in.Rootfs, @@ -130,7 +129,7 @@ func (c *controllerLocal) Shutdown(ctx context.Context, in *api.ControllerShutdo return nil, err } - if _, err := svc.StopSandbox(ctx, &proto.StopSandboxRequest{ + if _, err := svc.StopSandbox(ctx, &runtimeAPI.StopSandboxRequest{ SandboxID: in.SandboxID, TimeoutSecs: in.TimeoutSecs, }); err != nil { @@ -150,7 +149,7 @@ func (c *controllerLocal) Wait(ctx context.Context, in *api.ControllerWaitReques return nil, err } - resp, err := svc.WaitSandbox(ctx, &proto.WaitSandboxRequest{ + resp, err := svc.WaitSandbox(ctx, &runtimeAPI.WaitSandboxRequest{ SandboxID: in.SandboxID, }) @@ -170,7 +169,7 @@ func (c *controllerLocal) Status(ctx context.Context, in *api.ControllerStatusRe return nil, err } - resp, err := svc.SandboxStatus(ctx, &proto.SandboxStatusRequest{SandboxID: in.SandboxID}) + resp, err := svc.SandboxStatus(ctx, &runtimeAPI.SandboxStatusRequest{SandboxID: in.SandboxID}) if err != nil { return nil, fmt.Errorf("failed to query sandbox %s status: %w", in.SandboxID, err) } @@ -185,12 +184,12 @@ func (c *controllerLocal) Status(ctx context.Context, in *api.ControllerStatusRe }, nil } -func (c *controllerLocal) getSandbox(ctx context.Context, id string) (task.SandboxService, error) { +func (c *controllerLocal) getSandbox(ctx context.Context, id string) (runtimeAPI.SandboxService, error) { shim, err := c.shims.Get(ctx, id) if err != nil { return nil, errdefs.ErrNotFound } - svc := task.NewSandboxClient(shim.Client()) + svc := runtimeAPI.NewSandboxClient(shim.Client()) return svc, nil }