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 <[email protected]>

Author: dmcgowan

Makefile

@@ -177,7 +177,6 @@ protos: bin/protoc-gen-go-fieldpath
 	$(eval TMPDIR := $(shell mktemp -d))
 	@mv ${ROOTDIR}/vendor ${TMPDIR}
 	@(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES})
-	find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \;
 	@mv ${TMPDIR}/vendor ${ROOTDIR}
 	@rm -rf ${TMPDIR} v2
 	go-fix-acronym -w -a '^Os' $(shell find api/ -name '*.pb.go')
@@ -472,17 +471,18 @@ vendor: ## ensure all the go.mod/go.sum files are up-to-date including vendor/ d
 	@$(GO) mod tidy
 	@$(GO) mod vendor
 	@$(GO) mod verify
-	#@(cd ${ROOTDIR}/integration/client && ${GO} mod tidy)
+	@(cd ${ROOTDIR}/api && ${GO} mod tidy)
 
 verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date
 	@echo "$(WHALE) $@"
 	$(eval TMPDIR := $(shell mktemp -d))
 	@cp -R ${ROOTDIR} ${TMPDIR}
 	@(cd ${TMPDIR}/containerd && ${GO} mod tidy)
-	@(cd ${TMPDIR}/containerd/integration/client && ${GO} mod tidy)
+	@(cd ${TMPDIR}/containerd && ${GO} mod vendor)
+	@(cd ${TMPDIR}/containerd && ${GO} mod verify)
+	@(cd ${TMPDIR}/containerd/api && ${GO} mod tidy)
 	@diff -r -u -q ${ROOTDIR} ${TMPDIR}/containerd
 	@rm -rf ${TMPDIR}
-	#@${ROOTDIR}/script/verify-go-modules.sh integration/client
 
 
 help: ## this help

api/events/container.pb.go

@@ -21,7 +21,7 @@ package containerd.events;
 import "google/protobuf/any.proto";
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message ContainerCreate {

api/events/container.proto

@@ -20,7 +20,7 @@ package containerd.events;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message ContentDelete {

api/events/content.pb.go

@@ -20,7 +20,7 @@ package containerd.services.images.v1;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message ImageCreate {

api/events/content.proto

@@ -20,7 +20,7 @@ package containerd.events;
 
 import "github.com/containerd/containerd/api/types/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/v2/api/events;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.types.fieldpath_all) = true;
 
 message NamespaceCreate {