Make api a Go sub-module

Allow the api to stay at the same v1 go package name and keep using a
1.x version number. This indicates the API is still at 1.x and allows
sharing proto types with containerd 1.6 and 1.7 releases.

Signed-off-by: Derek McGowan <derek@mcg.dev>

cmd/containerd/builtins/builtins_linux.go

@@ -17,7 +17,7 @@
 package builtins
 
 import (
-	_ "github.com/containerd/containerd/v2/api/types/runc/options"
+	_ "github.com/containerd/containerd/api/types/runc/options"
 	_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
 	_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
 	_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"

cmd/containerd/command/publish.go

@@ -24,7 +24,7 @@ import (
 	"os"
 	"time"
 
-	eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
+	eventsapi "github.com/containerd/containerd/api/services/events/v1"
 	"github.com/containerd/containerd/v2/pkg/dialer"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/pkg/protobuf/proto"

cmd/containerd/server/server.go

@@ -46,9 +46,9 @@ import (
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 
-	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
-	sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
-	ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
+	diffapi "github.com/containerd/containerd/api/services/diff/v1"
+	sbapi "github.com/containerd/containerd/api/services/sandbox/v1"
+	ssapi "github.com/containerd/containerd/api/services/snapshots/v1"
 	srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
 	csproxy "github.com/containerd/containerd/v2/core/content/proxy"
 	"github.com/containerd/containerd/v2/core/diff"