diff --git a/client.go b/client.go index 1a32cbebc..c8c08295d 100644 --- a/client.go +++ b/client.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "github.com/containerd/containerd/api/services/containers" - contentapi "github.com/containerd/containerd/api/services/content" - diffapi "github.com/containerd/containerd/api/services/diff" - eventsapi "github.com/containerd/containerd/api/services/events" - imagesapi "github.com/containerd/containerd/api/services/images" - namespacesapi "github.com/containerd/containerd/api/services/namespaces" - snapshotapi "github.com/containerd/containerd/api/services/snapshot" - "github.com/containerd/containerd/api/services/tasks" - versionservice "github.com/containerd/containerd/api/services/version" + "github.com/containerd/containerd/api/services/containers/v1" + contentapi "github.com/containerd/containerd/api/services/content/v1" + diffapi "github.com/containerd/containerd/api/services/diff/v1" + eventsapi "github.com/containerd/containerd/api/services/events/v1" + imagesapi "github.com/containerd/containerd/api/services/images/v1" + namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" + snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" + "github.com/containerd/containerd/api/services/tasks/v1" + versionservice "github.com/containerd/containerd/api/services/version/v1" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/plugin" diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go index a92a0e665..95c083337 100644 --- a/cmd/containerd-shim/main_unix.go +++ b/cmd/containerd-shim/main_unix.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc" "github.com/Sirupsen/logrus" - shimapi "github.com/containerd/containerd/api/services/shim" + shimapi "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/linux/shim" "github.com/containerd/containerd/reaper" "github.com/containerd/containerd/version" diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index f0dd428b0..bef5a0461 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -18,14 +18,14 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "github.com/Sirupsen/logrus" - containersapi "github.com/containerd/containerd/api/services/containers" - contentapi "github.com/containerd/containerd/api/services/content" - diffapi "github.com/containerd/containerd/api/services/diff" - imagesapi "github.com/containerd/containerd/api/services/images" - namespacesapi "github.com/containerd/containerd/api/services/namespaces" - snapshotapi "github.com/containerd/containerd/api/services/snapshot" - api "github.com/containerd/containerd/api/services/tasks" - versionapi "github.com/containerd/containerd/api/services/version" + containersapi "github.com/containerd/containerd/api/services/containers/v1" + contentapi "github.com/containerd/containerd/api/services/content/v1" + diffapi "github.com/containerd/containerd/api/services/diff/v1" + imagesapi "github.com/containerd/containerd/api/services/images/v1" + namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" + snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" + api "github.com/containerd/containerd/api/services/tasks/v1" + versionapi "github.com/containerd/containerd/api/services/version/v1" "github.com/containerd/containerd/content" "github.com/containerd/containerd/events" "github.com/containerd/containerd/log" diff --git a/cmd/ctr/events.go b/cmd/ctr/events.go index 28991c2bd..8768c9e91 100644 --- a/cmd/ctr/events.go +++ b/cmd/ctr/events.go @@ -6,7 +6,7 @@ import ( "strings" "text/tabwriter" - eventsapi "github.com/containerd/containerd/api/services/events" + eventsapi "github.com/containerd/containerd/api/services/events/v1" "github.com/containerd/containerd/api/types/event" "github.com/gogo/protobuf/proto" "github.com/urfave/cli" diff --git a/cmd/ctr/run_windows.go b/cmd/ctr/run_windows.go index 86b20b2a3..a54780916 100644 --- a/cmd/ctr/run_windows.go +++ b/cmd/ctr/run_windows.go @@ -11,8 +11,8 @@ import ( "github.com/Sirupsen/logrus" "github.com/containerd/console" "github.com/containerd/containerd" - containersapi "github.com/containerd/containerd/api/services/containers" - "github.com/containerd/containerd/api/services/tasks" + containersapi "github.com/containerd/containerd/api/services/containers/v1" + "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/windows" diff --git a/cmd/ctr/shim.go b/cmd/ctr/shim.go index 9a1fb888f..716458747 100644 --- a/cmd/ctr/shim.go +++ b/cmd/ctr/shim.go @@ -19,7 +19,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/containerd/console" - "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/services/shim/v1" protobuf "github.com/gogo/protobuf/types" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/cmd/ctr/utils.go b/cmd/ctr/utils.go index 109a917e2..bb26cd86d 100644 --- a/cmd/ctr/utils.go +++ b/cmd/ctr/utils.go @@ -12,15 +12,15 @@ import ( "github.com/Sirupsen/logrus" "github.com/containerd/containerd" - containersapi "github.com/containerd/containerd/api/services/containers" - contentapi "github.com/containerd/containerd/api/services/content" - diffapi "github.com/containerd/containerd/api/services/diff" - "github.com/containerd/containerd/api/services/events" - imagesapi "github.com/containerd/containerd/api/services/images" - namespacesapi "github.com/containerd/containerd/api/services/namespaces" - snapshotapi "github.com/containerd/containerd/api/services/snapshot" - "github.com/containerd/containerd/api/services/tasks" - versionservice "github.com/containerd/containerd/api/services/version" + containersapi "github.com/containerd/containerd/api/services/containers/v1" + contentapi "github.com/containerd/containerd/api/services/content/v1" + diffapi "github.com/containerd/containerd/api/services/diff/v1" + "github.com/containerd/containerd/api/services/events/v1" + imagesapi "github.com/containerd/containerd/api/services/images/v1" + namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" + snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" + "github.com/containerd/containerd/api/services/tasks/v1" + versionservice "github.com/containerd/containerd/api/services/version/v1" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" "github.com/containerd/containerd/namespaces" diff --git a/container.go b/container.go index bd8411827..f9d5706b6 100644 --- a/container.go +++ b/container.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "github.com/containerd/containerd/api/services/containers" - "github.com/containerd/containerd/api/services/tasks" + "github.com/containerd/containerd/api/services/containers/v1" + "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types/mount" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" diff --git a/container_unix.go b/container_unix.go index 99f2520d9..573edc97f 100644 --- a/container_unix.go +++ b/container_unix.go @@ -8,8 +8,8 @@ import ( "fmt" "io/ioutil" - "github.com/containerd/containerd/api/services/containers" - "github.com/containerd/containerd/api/services/tasks" + "github.com/containerd/containerd/api/services/containers/v1" + "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" diff --git a/linux/runtime.go b/linux/runtime.go index b6bbcf48b..28a9099b8 100644 --- a/linux/runtime.go +++ b/linux/runtime.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc" - "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types/task" diff --git a/linux/shim.go b/linux/shim.go index bc5b99fd8..90efac51f 100644 --- a/linux/shim.go +++ b/linux/shim.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc" - "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/services/shim/v1" localShim "github.com/containerd/containerd/linux/shim" "github.com/containerd/containerd/log" "github.com/containerd/containerd/reaper" diff --git a/linux/shim/client.go b/linux/shim/client.go index bf8c7fa63..ee0321f10 100644 --- a/linux/shim/client.go +++ b/linux/shim/client.go @@ -6,7 +6,7 @@ import ( "path/filepath" "syscall" - shimapi "github.com/containerd/containerd/api/services/shim" + shimapi "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/api/types/task" runc "github.com/containerd/go-runc" google_protobuf "github.com/golang/protobuf/ptypes/empty" diff --git a/linux/shim/exec.go b/linux/shim/exec.go index 2b790b233..03614f303 100644 --- a/linux/shim/exec.go +++ b/linux/shim/exec.go @@ -16,7 +16,7 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/console" - shimapi "github.com/containerd/containerd/api/services/shim" + shimapi "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/linux/shim/init.go b/linux/shim/init.go index f6a42fc87..ce701cdd4 100644 --- a/linux/shim/init.go +++ b/linux/shim/init.go @@ -17,7 +17,7 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/console" - shimapi "github.com/containerd/containerd/api/services/shim" + shimapi "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/fifo" diff --git a/linux/shim/service.go b/linux/shim/service.go index 233ccba7b..17150e6aa 100644 --- a/linux/shim/service.go +++ b/linux/shim/service.go @@ -9,7 +9,7 @@ import ( "syscall" "github.com/containerd/console" - shimapi "github.com/containerd/containerd/api/services/shim" + shimapi "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/reaper" google_protobuf "github.com/golang/protobuf/ptypes/empty" diff --git a/linux/task.go b/linux/task.go index ecefd8e6e..a14816f4e 100644 --- a/linux/task.go +++ b/linux/task.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc" - "github.com/containerd/containerd/api/services/shim" + "github.com/containerd/containerd/api/services/shim/v1" "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/plugin" protobuf "github.com/gogo/protobuf/types" diff --git a/process.go b/process.go index f0e34acb3..7baf8231f 100644 --- a/process.go +++ b/process.go @@ -5,8 +5,8 @@ import ( "encoding/json" "syscall" - eventsapi "github.com/containerd/containerd/api/services/events" - "github.com/containerd/containerd/api/services/tasks" + eventsapi "github.com/containerd/containerd/api/services/events/v1" + "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types/event" tasktypes "github.com/containerd/containerd/api/types/task" "github.com/gogo/protobuf/proto" diff --git a/services/containers/helpers.go b/services/containers/helpers.go index d6193583a..0add18caa 100644 --- a/services/containers/helpers.go +++ b/services/containers/helpers.go @@ -1,7 +1,7 @@ package containers import ( - api "github.com/containerd/containerd/api/services/containers" + api "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/metadata" "github.com/containerd/containerd/namespaces" diff --git a/services/containers/service.go b/services/containers/service.go index 3884ab977..cf5f02bae 100644 --- a/services/containers/service.go +++ b/services/containers/service.go @@ -2,7 +2,7 @@ package containers import ( "github.com/boltdb/bolt" - api "github.com/containerd/containerd/api/services/containers" + api "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/containers" "github.com/containerd/containerd/events" diff --git a/services/content/reader.go b/services/content/reader.go index b7a311b36..3a5f6fde3 100644 --- a/services/content/reader.go +++ b/services/content/reader.go @@ -3,7 +3,7 @@ package content import ( "context" - contentapi "github.com/containerd/containerd/api/services/content" + contentapi "github.com/containerd/containerd/api/services/content/v1" digest "github.com/opencontainers/go-digest" ) diff --git a/services/content/service.go b/services/content/service.go index 20dc12a65..27879ac65 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/Sirupsen/logrus" - api "github.com/containerd/containerd/api/services/content" + api "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/content" "github.com/containerd/containerd/events" diff --git a/services/content/store.go b/services/content/store.go index d191b62c9..4c0fbe5c4 100644 --- a/services/content/store.go +++ b/services/content/store.go @@ -4,7 +4,7 @@ import ( "context" "io" - contentapi "github.com/containerd/containerd/api/services/content" + contentapi "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" digest "github.com/opencontainers/go-digest" ) diff --git a/services/content/writer.go b/services/content/writer.go index 884de001f..dfa42690b 100644 --- a/services/content/writer.go +++ b/services/content/writer.go @@ -3,7 +3,7 @@ package content import ( "io" - contentapi "github.com/containerd/containerd/api/services/content" + contentapi "github.com/containerd/containerd/api/services/content/v1" "github.com/containerd/containerd/content" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" diff --git a/services/diff/client.go b/services/diff/client.go index da79e905f..d86a5c0c5 100644 --- a/services/diff/client.go +++ b/services/diff/client.go @@ -1,7 +1,7 @@ package diff import ( - diffapi "github.com/containerd/containerd/api/services/diff" + diffapi "github.com/containerd/containerd/api/services/diff/v1" "github.com/containerd/containerd/api/types/descriptor" mounttypes "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/mount" diff --git a/services/diff/service.go b/services/diff/service.go index c132575e9..097546ef1 100644 --- a/services/diff/service.go +++ b/services/diff/service.go @@ -1,7 +1,7 @@ package diff import ( - diffapi "github.com/containerd/containerd/api/services/diff" + diffapi "github.com/containerd/containerd/api/services/diff/v1" mounttypes "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/plugin" diff --git a/services/events/service.go b/services/events/service.go index 4edc0ed08..cf9850cfa 100644 --- a/services/events/service.go +++ b/services/events/service.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Sirupsen/logrus" - api "github.com/containerd/containerd/api/services/events" + api "github.com/containerd/containerd/api/services/events/v1" "github.com/containerd/containerd/events" "github.com/containerd/containerd/plugin" "google.golang.org/grpc" diff --git a/services/images/client.go b/services/images/client.go index d12d1c09f..75e20b6bc 100644 --- a/services/images/client.go +++ b/services/images/client.go @@ -3,7 +3,7 @@ package images import ( "context" - imagesapi "github.com/containerd/containerd/api/services/images" + imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/images/helpers.go b/services/images/helpers.go index f2d9aed56..b9c07cf34 100644 --- a/services/images/helpers.go +++ b/services/images/helpers.go @@ -1,7 +1,7 @@ package images import ( - imagesapi "github.com/containerd/containerd/api/services/images" + imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/images" "github.com/containerd/containerd/metadata" diff --git a/services/images/service.go b/services/images/service.go index 31d9fd538..b5bc6e34e 100644 --- a/services/images/service.go +++ b/services/images/service.go @@ -2,7 +2,7 @@ package images import ( "github.com/boltdb/bolt" - imagesapi "github.com/containerd/containerd/api/services/images" + imagesapi "github.com/containerd/containerd/api/services/images/v1" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/events" "github.com/containerd/containerd/images" diff --git a/services/namespaces/client.go b/services/namespaces/client.go index e92314dcc..c3a148f5e 100644 --- a/services/namespaces/client.go +++ b/services/namespaces/client.go @@ -4,7 +4,7 @@ import ( "context" "strings" - api "github.com/containerd/containerd/api/services/namespaces" + api "github.com/containerd/containerd/api/services/namespaces/v1" "github.com/containerd/containerd/namespaces" "github.com/gogo/protobuf/types" ) diff --git a/services/namespaces/service.go b/services/namespaces/service.go index 620856eb8..f7051b70a 100644 --- a/services/namespaces/service.go +++ b/services/namespaces/service.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/boltdb/bolt" - api "github.com/containerd/containerd/api/services/namespaces" + api "github.com/containerd/containerd/api/services/namespaces/v1" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/events" "github.com/containerd/containerd/metadata" diff --git a/services/snapshot/client.go b/services/snapshot/client.go index 96124b7ac..5b3479c7d 100644 --- a/services/snapshot/client.go +++ b/services/snapshot/client.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - snapshotapi "github.com/containerd/containerd/api/services/snapshot" + snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" mountapi "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/snapshot" diff --git a/services/snapshot/service.go b/services/snapshot/service.go index e2ecd6948..59d7fe2de 100644 --- a/services/snapshot/service.go +++ b/services/snapshot/service.go @@ -3,7 +3,7 @@ package snapshot import ( gocontext "context" - snapshotapi "github.com/containerd/containerd/api/services/snapshot" + snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1" "github.com/containerd/containerd/api/types/event" mounttypes "github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/events" diff --git a/services/tasks/service.go b/services/tasks/service.go index e368c55e4..f4b838f6b 100644 --- a/services/tasks/service.go +++ b/services/tasks/service.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/boltdb/bolt" - api "github.com/containerd/containerd/api/services/tasks" + api "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/task" diff --git a/services/version/service.go b/services/version/service.go index 09a2bf3a1..6cdb98e0c 100644 --- a/services/version/service.go +++ b/services/version/service.go @@ -1,7 +1,7 @@ package version import ( - api "github.com/containerd/containerd/api/services/version" + api "github.com/containerd/containerd/api/services/version/v1" "github.com/containerd/containerd/plugin" ctrdversion "github.com/containerd/containerd/version" empty "github.com/golang/protobuf/ptypes/empty" diff --git a/spec_unix.go b/spec_unix.go index 9eb337710..375428973 100644 --- a/spec_unix.go +++ b/spec_unix.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/api/services/containers" + "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/images" protobuf "github.com/gogo/protobuf/types" "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/spec_windows.go b/spec_windows.go index 4af108ada..7f0bae0cb 100644 --- a/spec_windows.go +++ b/spec_windows.go @@ -6,7 +6,7 @@ import ( "fmt" "runtime" - "github.com/containerd/containerd/api/services/containers" + "github.com/containerd/containerd/api/services/containers/v1" "github.com/containerd/containerd/images" protobuf "github.com/gogo/protobuf/types" "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/task.go b/task.go index 8b2875a64..be720a6a5 100644 --- a/task.go +++ b/task.go @@ -10,9 +10,9 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/api/services/containers" - eventsapi "github.com/containerd/containerd/api/services/events" - "github.com/containerd/containerd/api/services/tasks" + "github.com/containerd/containerd/api/services/containers/v1" + eventsapi "github.com/containerd/containerd/api/services/events/v1" + "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/api/types/event" tasktypes "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/content"