Merge pull request #9306 from dmcgowan/containerd-v2-module
Containerd v2 module
This commit is contained in:
		| @@ -32,6 +32,8 @@ issues: | ||||
|     - path: 'archive[\\/]tarheader[\\/]' | ||||
|       # conversion is necessary on Linux, unnecessary on macOS | ||||
|       text: "unnecessary conversion" | ||||
|     - path: 'integration[\\/]client' | ||||
|       text: "dot-imports:" | ||||
|     - linters: | ||||
|         - revive | ||||
|       text: "if-return" | ||||
| @@ -63,6 +65,8 @@ linters-settings: | ||||
|       - G306 | ||||
|       - G402 | ||||
|       - G404 | ||||
|   nolintlint: | ||||
|     allow-unused: true | ||||
|  | ||||
| run: | ||||
|   timeout: 8m | ||||
|   | ||||
							
								
								
									
										7
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								Makefile
									
									
									
									
									
								
							| @@ -179,8 +179,9 @@ protos: bin/protoc-gen-go-fieldpath | ||||
| 	@mv ${ROOTDIR}/vendor ${TMPDIR} | ||||
| 	@(cd ${ROOTDIR}/api && PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${API_PACKAGES}) | ||||
| 	@(PATH="${ROOTDIR}/bin:${PATH}" protobuild --quiet ${NON_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} | ||||
| 	@rm -rf ${TMPDIR} v2 | ||||
| 	go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go') | ||||
|  | ||||
| check-protos: protos ## check if protobufs needs to be generated again | ||||
| @@ -472,7 +473,7 @@ 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}/integration/client && ${GO} mod tidy) | ||||
|  | ||||
| verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date | ||||
| 	@echo "$(WHALE) $@" | ||||
| @@ -482,7 +483,7 @@ verify-vendor: ## verify if all the go.mod/go.sum files are up-to-date | ||||
| 	@(cd ${TMPDIR}/containerd/integration/client && ${GO} mod tidy) | ||||
| 	@diff -r -u -q ${ROOTDIR} ${TMPDIR}/containerd | ||||
| 	@rm -rf ${TMPDIR} | ||||
| 	@${ROOTDIR}/script/verify-go-modules.sh integration/client | ||||
| 	#@${ROOTDIR}/script/verify-go-modules.sh integration/client | ||||
|  | ||||
|  | ||||
| help: ## this help | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -316,11 +316,11 @@ var file_github_com_containerd_containerd_api_events_container_proto_rawDesc = [ | ||||
| 	0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x21, 0x0a, 0x0f, | ||||
| 	0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, | ||||
| 	0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, | ||||
| 	0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, | ||||
| 	0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, | ||||
| 	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, | ||||
| 	0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, | ||||
| 	0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.events; | ||||
| import "google/protobuf/any.proto"; | ||||
| import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
| option (containerd.plugin.fieldpath_all) = true; | ||||
|  | ||||
| message ContainerCreate { | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	reflect "reflect" | ||||
| @@ -97,11 +97,11 @@ var file_github_com_containerd_containerd_api_events_content_proto_rawDesc = []b | ||||
| 	0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x70, 0x61, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x22, 0x27, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x6c, 0x65, 0x74, | ||||
| 	0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, | ||||
| 	0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x42, 0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, | ||||
| 	0x09, 0x52, 0x06, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x42, 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, | ||||
| 	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, | ||||
| 	0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, | ||||
| 	0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, | ||||
| 	0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, | ||||
| 	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, | ||||
| 	0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.events; | ||||
|  | ||||
| import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
| option (containerd.plugin.fieldpath_all) = true; | ||||
|  | ||||
| message ContentDelete { | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	reflect "reflect" | ||||
| @@ -229,11 +229,11 @@ var file_github_com_containerd_containerd_api_events_image_proto_rawDesc = []byt | ||||
| 	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, | ||||
| 	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x21, 0x0a, 0x0b, 0x49, 0x6d, 0x61, 0x67, | ||||
| 	0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, | ||||
| 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x38, 0x5a, 0x32, 0x67, | ||||
| 	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x3b, 0x5a, 0x35, 0x67, | ||||
| 	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, | ||||
| 	0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, | ||||
| 	0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, | ||||
| 	0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.services.images.v1; | ||||
|  | ||||
| import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
| option (containerd.plugin.fieldpath_all) = true; | ||||
|  | ||||
| message ImageCreate { | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	reflect "reflect" | ||||
| @@ -229,11 +229,11 @@ var file_github_com_containerd_containerd_api_events_namespace_proto_rawDesc = [ | ||||
| 	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x25, 0x0a, 0x0f, 0x4e, 0x61, 0x6d, 0x65, | ||||
| 	0x73, 0x70, 0x61, 0x63, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, | ||||
| 	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, | ||||
| 	0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, | ||||
| 	0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, | ||||
| 	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, | ||||
| 	0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, | ||||
| 	0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.events; | ||||
|  | ||||
| import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
| option (containerd.plugin.fieldpath_all) = true; | ||||
|  | ||||
| message NamespaceCreate { | ||||
|   | ||||
| @@ -217,11 +217,11 @@ var file_github_com_containerd_containerd_api_events_sandbox_proto_rawDesc = []b | ||||
| 	0x0a, 0x09, 0x65, 0x78, 0x69, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, | ||||
| 	0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x08, 0x65, | ||||
| 	0x78, 0x69, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x78, 0x69, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x37, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, | ||||
| 	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.events; | ||||
|  | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
|  | ||||
| message SandboxCreate { | ||||
| 	string sandbox_id = 1; | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	reflect "reflect" | ||||
| @@ -245,11 +245,11 @@ var file_github_com_containerd_containerd_api_events_snapshot_proto_rawDesc = [] | ||||
| 	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, | ||||
| 	0x0a, 0x0b, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x74, 0x65, 0x72, 0x18, 0x05, 0x20, | ||||
| 	0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x74, 0x65, 0x72, | ||||
| 	0x42, 0x38, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x42, 0x3b, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, | ||||
| 	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, | ||||
| 	0x6f, 0x33, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, | ||||
| 	0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.events; | ||||
|  | ||||
| import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
| option (containerd.plugin.fieldpath_all) = true; | ||||
|  | ||||
| message SnapshotPrepare { | ||||
|   | ||||
| @@ -22,8 +22,8 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	timestamppb "google.golang.org/protobuf/types/known/timestamppb" | ||||
| @@ -813,11 +813,12 @@ var file_github_com_containerd_containerd_api_events_task_proto_rawDesc = []byte | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, | ||||
| 	0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, | ||||
| 	0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, | ||||
| 	0x52, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x38, 0x5a, 0x32, | ||||
| 	0x52, 0x0a, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0x3b, 0x5a, 0x35, | ||||
| 	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, | ||||
| 	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, 0x76, 0x65, 0x6e, | ||||
| 	0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x65, | ||||
| 	0x76, 0x65, 0x6e, 0x74, 0x73, 0xa0, 0xf4, 0x1e, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto"; | ||||
| import "github.com/containerd/containerd/api/types/mount.proto"; | ||||
| import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/events;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/events;events"; | ||||
| option (containerd.plugin.fieldpath_all) = true; | ||||
|  | ||||
| message TaskCreate { | ||||
|   | ||||
| @@ -49,7 +49,7 @@ file { | ||||
|     json_name: "fieldpath" | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/protobuf/plugin" | ||||
|     go_package: "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
|   } | ||||
| } | ||||
| file { | ||||
| @@ -163,7 +163,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|     63300: 1 | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| @@ -183,7 +183,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|     63300: 1 | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| @@ -279,7 +279,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|     63300: 1 | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| @@ -375,7 +375,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|     63300: 1 | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| @@ -461,7 +461,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -535,7 +535,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|     63300: 1 | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| @@ -575,7 +575,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types;types" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types;types" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -847,7 +847,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/events;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/events;events" | ||||
|     63300: 1 | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| @@ -880,7 +880,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types;types" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types;types" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -916,7 +916,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types;types" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types;types" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -1334,7 +1334,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/runtime/sandbox/v1;sandbox" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/runtime/sandbox/v1;sandbox" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -1481,7 +1481,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types/task" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types/task" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -2196,7 +2196,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/runtime/task/v2;task" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/runtime/task/v2;task" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -2911,7 +2911,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/runtime/task/v3;task" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/runtime/task/v3;task" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -3241,7 +3241,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/containers/v1;containers" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/containers/v1;containers" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -3724,7 +3724,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/content/v1;content" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/content/v1;content" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -3784,7 +3784,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types;types" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types;types" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -3948,7 +3948,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/diff/v1;diff" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/diff/v1;diff" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -4054,7 +4054,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/events/v1;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/events/v1;events" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -4296,7 +4296,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/images/v1;images" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/images/v1;images" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -4512,7 +4512,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/introspection/v1;introspection" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/introspection/v1;introspection" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -4762,7 +4762,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/leases/v1;leases" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/leases/v1;leases" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -4942,7 +4942,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/namespaces/v1;namespaces" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/namespaces/v1;namespaces" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -5076,7 +5076,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types;types" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types;types" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -5653,7 +5653,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/sandbox/v1;sandbox" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/sandbox/v1;sandbox" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -6167,7 +6167,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/snapshots/v1;snapshots" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/snapshots/v1;snapshots" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -6196,7 +6196,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/streaming/v1;streaming" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/streaming/v1;streaming" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -6841,7 +6841,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/tasks/v1;tasks" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/tasks/v1;tasks" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -6896,7 +6896,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/transfer/v1;transfer" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/transfer/v1;transfer" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -6963,7 +6963,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/ttrpc/events/v1;events" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1;events" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -6997,7 +6997,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/services/version/v1;version" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/services/version/v1;version" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -7138,7 +7138,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types/transfer" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types/transfer" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -7217,7 +7217,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types/transfer" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types/transfer" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -7263,7 +7263,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types/transfer" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types/transfer" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -7404,7 +7404,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types/transfer" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types/transfer" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
| @@ -7432,7 +7432,7 @@ file { | ||||
|     } | ||||
|   } | ||||
|   options { | ||||
|     go_package: "github.com/containerd/containerd/api/types/transfer" | ||||
|     go_package: "github.com/containerd/containerd/v2/api/types/transfer" | ||||
|   } | ||||
|   syntax: "proto3" | ||||
| } | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package sandbox | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -1287,12 +1287,12 @@ var file_github_com_containerd_containerd_api_runtime_sandbox_v1_sandbox_proto_r | ||||
| 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, | ||||
| 	0x64, 0x2e, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, | ||||
| 	0x78, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x4d, 0x65, 0x74, 0x72, | ||||
| 	0x69, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x41, 0x5a, 0x3f, 0x67, | ||||
| 	0x69, 0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x44, 0x5a, 0x42, 0x67, | ||||
| 	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, | ||||
| 	0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x73, 0x61, 0x6e, 0x64, | ||||
| 	0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x73, | ||||
| 	0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, | ||||
| 	0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -25,7 +25,7 @@ import "github.com/containerd/containerd/api/types/mount.proto"; | ||||
| import "github.com/containerd/containerd/api/types/platform.proto"; | ||||
| import "github.com/containerd/containerd/api/types/metrics.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/runtime/sandbox/v1;sandbox"; | ||||
| option go_package = "github.com/containerd/containerd/v2/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 | ||||
|   | ||||
| @@ -22,8 +22,8 @@ | ||||
| package task | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	task "github.com/containerd/containerd/api/types/task" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	task "github.com/containerd/containerd/v2/api/types/task" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -1889,11 +1889,11 @@ var file_github_com_containerd_containerd_api_runtime_task_v2_shim_proto_rawDesc | ||||
| 	0x65, 0x72, 0x64, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x76, 0x32, 0x2e, 0x53, 0x68, 0x75, 0x74, | ||||
| 	0x64, 0x6f, 0x77, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, | ||||
| 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, | ||||
| 	0x70, 0x74, 0x79, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, | ||||
| 	0x70, 0x74, 0x79, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, | ||||
| 	0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, | ||||
| 	0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x32, 0x3b, 0x74, 0x61, 0x73, 0x6b, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, | ||||
| 	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x32, 0x3b, 0x74, | ||||
| 	0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -24,7 +24,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/api/runtime/task/v2;task"; | ||||
| option go_package = "github.com/containerd/containerd/v2/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 | ||||
|   | ||||
| @@ -22,8 +22,8 @@ | ||||
| package task | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	task "github.com/containerd/containerd/api/types/task" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	task "github.com/containerd/containerd/v2/api/types/task" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -1889,11 +1889,11 @@ var file_github_com_containerd_containerd_api_runtime_task_v3_shim_proto_rawDesc | ||||
| 	0x65, 0x72, 0x64, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x68, 0x75, 0x74, | ||||
| 	0x64, 0x6f, 0x77, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, | ||||
| 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, | ||||
| 	0x70, 0x74, 0x79, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, | ||||
| 	0x70, 0x74, 0x79, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, | ||||
| 	0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x75, 0x6e, 0x74, | ||||
| 	0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x61, 0x73, 0x6b, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, | ||||
| 	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x76, 0x33, 0x3b, 0x74, | ||||
| 	0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -24,7 +24,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/api/runtime/task/v3;task"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/runtime/task/v3;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 | ||||
|   | ||||
| @@ -929,12 +929,12 @@ var file_github_com_containerd_containerd_api_services_containers_v1_containers_ | ||||
| 	0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, | ||||
| 	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, | ||||
| 	0x79, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x79, 0x42, 0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, | ||||
| 	0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x31, | ||||
| 	0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, | ||||
| 	0x74, 0x6f, 0x33, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, | ||||
| 	0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, | ||||
| 	0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/protobuf/empty.proto"; | ||||
| import "google/protobuf/field_mask.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/containers/v1;containers"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/containers/v1;containers"; | ||||
|  | ||||
| // Containers provides metadata storage for containers used in the execution | ||||
| // service. | ||||
|   | ||||
| @@ -1452,12 +1452,12 @@ var file_github_com_containerd_containerd_api_services_content_v1_content_proto_ | ||||
| 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, | ||||
| 	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x62, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, | ||||
| 	0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, | ||||
| 	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, | ||||
| 	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, | ||||
| 	0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, | ||||
| 	0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, | ||||
| 	0x6e, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, | ||||
| 	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x63, 0x6f, | ||||
| 	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -22,7 +22,7 @@ import "google/protobuf/field_mask.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
| import "google/protobuf/empty.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/content/v1;content"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/content/v1;content"; | ||||
|  | ||||
| // Content provides access to a content addressable storage system. | ||||
| service Content { | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package diff | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -383,12 +383,12 @@ var file_github_com_containerd_containerd_api_services_diff_v1_diff_proto_rawDes | ||||
| 	0x66, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x69, 0x66, 0x66, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, | ||||
| 	0x1a, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, | ||||
| 	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x64, 0x69, 0x66, 0x66, 0x2e, 0x76, 0x31, 0x2e, 0x44, | ||||
| 	0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3c, 0x5a, 0x3a, 0x67, | ||||
| 	0x69, 0x66, 0x66, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x3f, 0x5a, 0x3d, 0x67, | ||||
| 	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, | ||||
| 	0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x64, 0x69, 0x66, | ||||
| 	0x66, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x69, 0x66, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| 	0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, | ||||
| 	0x64, 0x69, 0x66, 0x66, 0x2f, 0x76, 0x31, 0x3b, 0x64, 0x69, 0x66, 0x66, 0x62, 0x06, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/protobuf/timestamp.proto"; | ||||
| import "github.com/containerd/containerd/api/types/mount.proto"; | ||||
| import "github.com/containerd/containerd/api/types/descriptor.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/diff/v1;diff"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/diff/v1;diff"; | ||||
|  | ||||
| // Diff service creates and applies diffs | ||||
| service Diff { | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -319,12 +319,12 @@ var file_github_com_containerd_containerd_api_services_events_v1_events_proto_ra | ||||
| 	0x76, 0x31, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, | ||||
| 	0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, | ||||
| 	0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, | ||||
| 	0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x30, 0x01, 0x42, 0x40, | ||||
| 	0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x2e, 0x76, 0x31, 0x2e, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x30, 0x01, 0x42, 0x43, | ||||
| 	0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, | ||||
| 	0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, | ||||
| 	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, | ||||
| 	0x65, 0x73, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, | ||||
| 	0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/protobuf/any.proto"; | ||||
| import "google/protobuf/empty.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/events/v1;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/events/v1;events"; | ||||
|  | ||||
| service Events { | ||||
| 	// Publish an event to a topic. | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package images | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	emptypb "google.golang.org/protobuf/types/known/emptypb" | ||||
| @@ -746,11 +746,11 @@ var file_github_com_containerd_containerd_api_services_images_v1_images_proto_ra | ||||
| 	0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6d, 0x61, 0x67, | ||||
| 	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, | ||||
| 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, | ||||
| 	0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, | ||||
| 	0x73, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6d, 0x61, 0x67, | ||||
| 	0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, | ||||
| 	0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x69, | ||||
| 	0x6d, 0x61, 0x67, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/protobuf/field_mask.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
| import "github.com/containerd/containerd/api/types/descriptor.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/images/v1;images"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/images/v1;images"; | ||||
|  | ||||
| // Images is a service that allows one to register images with containerd. | ||||
| // | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package introspection | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	status "google.golang.org/genproto/googleapis/rpc/status" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| @@ -486,12 +486,12 @@ var file_github_com_containerd_containerd_api_services_introspection_v1_introspe | ||||
| 	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, | ||||
| 	0x73, 0x2e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, | ||||
| 	0x76, 0x31, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, | ||||
| 	0x65, 0x42, 0x4e, 0x5a, 0x4c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x65, 0x42, 0x51, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, | ||||
| 	0x65, 0x73, 0x2f, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, | ||||
| 	0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x69, 0x6f, | ||||
| 	0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, | ||||
| 	0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, | ||||
| 	0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, | ||||
| 	0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/rpc/status.proto"; | ||||
| import "google/protobuf/empty.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/introspection/v1;introspection"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/introspection/v1;introspection"; | ||||
|  | ||||
| service Introspection { | ||||
| 	// Plugins returns a list of plugins in containerd. | ||||
|   | ||||
| @@ -736,11 +736,11 @@ var file_github_com_containerd_containerd_api_services_leases_v1_leases_proto_ra | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, | ||||
| 	0x2e, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, | ||||
| 	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, | ||||
| 	0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x42, 0x43, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, | ||||
| 	0x73, 0x2f, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6c, 0x65, 0x61, 0x73, | ||||
| 	0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, | ||||
| 	0x69, 0x63, 0x65, 0x73, 0x2f, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6c, | ||||
| 	0x65, 0x61, 0x73, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.services.leases.v1; | ||||
| import "google/protobuf/empty.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/leases/v1;leases"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/leases/v1;leases"; | ||||
|  | ||||
| // Leases service manages resources leases within the metadata store. | ||||
| service Leases { | ||||
|   | ||||
| @@ -657,12 +657,12 @@ var file_github_com_containerd_containerd_api_services_namespaces_v1_namespace_p | ||||
| 	0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, | ||||
| 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, | ||||
| 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, | ||||
| 	0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, | ||||
| 	0x4b, 0x5a, 0x49, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, | ||||
| 	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, | ||||
| 	0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x6e, | ||||
| 	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, | ||||
| 	0x63, 0x65, 0x73, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x2f, 0x76, | ||||
| 	0x31, 0x3b, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.services.namespaces.v1; | ||||
| import "google/protobuf/empty.proto"; | ||||
| import "google/protobuf/field_mask.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/namespaces/v1;namespaces"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/namespaces/v1;namespaces"; | ||||
|  | ||||
| // Namespaces provides the ability to manipulate containerd namespaces. | ||||
| // | ||||
|   | ||||
| @@ -30,7 +30,7 @@ | ||||
| package sandbox | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -1742,12 +1742,12 @@ var file_github_com_containerd_containerd_api_services_sandbox_v1_sandbox_proto_ | ||||
| 	0x39, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, | ||||
| 	0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x76, 0x31, | ||||
| 	0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4d, 0x65, 0x74, 0x72, 0x69, | ||||
| 	0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, | ||||
| 	0x63, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, | ||||
| 	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x61, 0x6e, 0x64, | ||||
| 	0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, | ||||
| 	0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, | ||||
| 	0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x61, 0x6e, 0x64, 0x62, 0x6f, | ||||
| 	0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -33,7 +33,7 @@ import "github.com/containerd/containerd/api/types/mount.proto"; | ||||
| import "github.com/containerd/containerd/api/types/platform.proto"; | ||||
| import "github.com/containerd/containerd/api/types/metrics.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/sandbox/v1;sandbox"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/sandbox/v1;sandbox"; | ||||
|  | ||||
| // Store provides a metadata storage interface for sandboxes. Similarly to `Containers`, | ||||
| // sandbox object includes info required to start a new instance, but no runtime state. | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package snapshots | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	emptypb "google.golang.org/protobuf/types/known/emptypb" | ||||
| @@ -1376,12 +1376,12 @@ var file_github_com_containerd_containerd_api_services_snapshots_v1_snapshots_pr | ||||
| 	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, | ||||
| 	0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x65, 0x61, 0x6e, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, | ||||
| 	0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, | ||||
| 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, | ||||
| 	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, | ||||
| 	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, 0x6e, 0x61, 0x70, | ||||
| 	0x73, 0x68, 0x6f, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, | ||||
| 	0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, | ||||
| 	0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x73, | ||||
| 	0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x6e, 0x61, 0x70, | ||||
| 	0x73, 0x68, 0x6f, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/protobuf/field_mask.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
| import "github.com/containerd/containerd/api/types/mount.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/snapshots/v1;snapshots"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/snapshots/v1;snapshots"; | ||||
|  | ||||
| // Snapshot service manages snapshots | ||||
| service Snapshots { | ||||
|   | ||||
| @@ -100,12 +100,13 @@ var file_github_com_containerd_containerd_api_services_streaming_v1_streaming_pr | ||||
| 	0x6d, 0x69, 0x6e, 0x67, 0x12, 0x38, 0x0a, 0x06, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x14, | ||||
| 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, | ||||
| 	0x2e, 0x41, 0x6e, 0x79, 0x1a, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x28, 0x01, 0x30, 0x01, 0x42, 0x46, | ||||
| 	0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x28, 0x01, 0x30, 0x01, 0x42, 0x49, | ||||
| 	0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, | ||||
| 	0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, | ||||
| 	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x74, 0x72, | ||||
| 	0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, | ||||
| 	0x65, 0x73, 0x2f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x3b, | ||||
| 	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.services.streaming.v1; | ||||
|  | ||||
| import "google/protobuf/any.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/streaming/v1;streaming"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/streaming/v1;streaming"; | ||||
|  | ||||
| service Streaming { | ||||
| 	rpc Stream(stream google.protobuf.Any) returns (stream google.protobuf.Any); | ||||
|   | ||||
| @@ -22,8 +22,8 @@ | ||||
| package tasks | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	task "github.com/containerd/containerd/api/types/task" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	task "github.com/containerd/containerd/v2/api/types/task" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -1893,11 +1893,11 @@ var file_github_com_containerd_containerd_api_services_tasks_v1_tasks_proto_rawD | ||||
| 	0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, | ||||
| 	0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x74, 0x61, 0x73, 0x6b, 0x73, | ||||
| 	0x2e, 0x76, 0x31, 0x2e, 0x57, 0x61, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, | ||||
| 	0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, | ||||
| 	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, | ||||
| 	0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x61, 0x73, 0x6b, 0x73, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, | ||||
| 	0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x61, | ||||
| 	0x73, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -26,7 +26,7 @@ import "github.com/containerd/containerd/api/types/descriptor.proto"; | ||||
| import "github.com/containerd/containerd/api/types/task/task.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/tasks/v1;tasks"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/tasks/v1;tasks"; | ||||
|  | ||||
| service Tasks { | ||||
| 	// Create a task. | ||||
|   | ||||
| @@ -182,12 +182,12 @@ var file_github_com_containerd_containerd_api_services_transfer_v1_transfer_prot | ||||
| 	0x63, 0x65, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, | ||||
| 	0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, | ||||
| 	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, | ||||
| 	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x44, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x47, 0x5a, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, | ||||
| 	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, | ||||
| 	0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, | ||||
| 	0x73, 0x66, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.services.transfer.v1; | ||||
| import "google/protobuf/any.proto"; | ||||
| import "google/protobuf/empty.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/transfer/v1;transfer"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/transfer/v1;transfer"; | ||||
|  | ||||
| service Transfer { | ||||
| 	rpc Transfer(TransferRequest) returns (google.protobuf.Empty); | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package events | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/protobuf/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/protobuf/plugin" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	anypb "google.golang.org/protobuf/types/known/anypb" | ||||
| @@ -199,12 +199,12 @@ var file_github_com_containerd_containerd_api_services_ttrpc_events_v1_events_pr | ||||
| 	0x73, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x74, 0x74, 0x72, 0x70, 0x63, 0x2e, 0x76, | ||||
| 	0x31, 0x2e, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, | ||||
| 	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, | ||||
| 	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, | ||||
| 	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, | ||||
| 	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, | ||||
| 	0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, | ||||
| 	0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x74, 0x72, 0x70, 0x63, 0x2f, | ||||
| 	0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, | ||||
| 	0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x74, 0x74, 0x72, | ||||
| 	0x70, 0x63, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x76, 0x65, | ||||
| 	0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import "google/protobuf/any.proto"; | ||||
| import "google/protobuf/empty.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/services/ttrpc/events/v1;events"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1;events"; | ||||
|  | ||||
| service Events { | ||||
| 	// Forward sends an event that has already been packaged into an envelope | ||||
|   | ||||
| @@ -112,12 +112,12 @@ var file_github_com_containerd_containerd_api_services_version_v1_version_proto_ | ||||
| 	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2f, 0x2e, 0x63, | ||||
| 	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, | ||||
| 	0x65, 0x73, 0x2e, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, | ||||
| 	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x42, 0x5a, | ||||
| 	0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, | ||||
| 	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x45, 0x5a, | ||||
| 	0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, | ||||
| 	0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, | ||||
| 	0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x76, | ||||
| 	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, | ||||
| 	0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, | ||||
| 	0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x65, 0x72, | ||||
| 	0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.services.version.v1; | ||||
| import "google/protobuf/empty.proto"; | ||||
|  | ||||
| // TODO(stevvooe): Should version service actually be versioned? | ||||
| option go_package = "github.com/containerd/containerd/api/services/version/v1;version"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/services/version/v1;version"; | ||||
|  | ||||
| service Version { | ||||
| 	rpc Version(google.protobuf.Empty) returns (VersionResponse); | ||||
|   | ||||
| @@ -133,11 +133,11 @@ var file_github_com_containerd_containerd_api_types_descriptor_proto_rawDesc = [ | ||||
| 	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, | ||||
| 	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, | ||||
| 	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, | ||||
| 	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, | ||||
| 	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, | ||||
| 	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, | ||||
| 	0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, | ||||
| 	0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -18,7 +18,7 @@ syntax = "proto3"; | ||||
|  | ||||
| package containerd.types; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types;types"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types;types"; | ||||
|  | ||||
| // Descriptor describes a blob in a content store. | ||||
| // | ||||
|   | ||||
| @@ -119,11 +119,11 @@ var file_github_com_containerd_containerd_api_types_metrics_proto_rawDesc = []by | ||||
| 	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x04, | ||||
| 	0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, | ||||
| 	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, | ||||
| 	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, | ||||
| 	0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, | ||||
| 	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, | ||||
| 	0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, | ||||
| 	0x6f, 0x33, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, | ||||
| 	0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.types; | ||||
| import "google/protobuf/any.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types;types"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types;types"; | ||||
|  | ||||
| message Metric { | ||||
| 	google.protobuf.Timestamp timestamp = 1; | ||||
|   | ||||
| @@ -132,10 +132,10 @@ var file_github_com_containerd_containerd_api_types_mount_proto_rawDesc = []byte | ||||
| 	0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, | ||||
| 	0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, | ||||
| 	0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, | ||||
| 	0x73, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x73, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, | ||||
| 	0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, | ||||
| 	0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -18,7 +18,7 @@ syntax = "proto3"; | ||||
|  | ||||
| package containerd.types; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types;types"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types;types"; | ||||
|  | ||||
| // Mount describes mounts for a container. | ||||
| // | ||||
|   | ||||
| @@ -113,11 +113,11 @@ var file_github_com_containerd_containerd_api_types_platform_proto_rawDesc = []b | ||||
| 	0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, | ||||
| 	0x0c, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x12, 0x18, 0x0a, | ||||
| 	0x07, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, | ||||
| 	0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, | ||||
| 	0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, | ||||
| 	0x74, 0x6f, 0x33, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -18,7 +18,7 @@ syntax = "proto3"; | ||||
|  | ||||
| package containerd.types; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types;types"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types;types"; | ||||
|  | ||||
| // Platform follows the structure of the OCI platform specification, from | ||||
| // descriptors. | ||||
|   | ||||
| @@ -261,11 +261,11 @@ var file_github_com_containerd_containerd_api_types_sandbox_proto_rawDesc = []by | ||||
| 	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, | ||||
| 	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, | ||||
| 	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x32, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, | ||||
| 	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, | ||||
| 	0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, | ||||
| 	0x74, 0x6f, 0x33, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, | ||||
| 	0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x3b, 0x74, 0x79, 0x70, 0x65, 0x73, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.types; | ||||
| import "google/protobuf/any.proto"; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types;types"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types;types"; | ||||
|  | ||||
| // Sandbox represents a sandbox metadata object that keeps all info required by controller to | ||||
| // work with a particular instance. | ||||
|   | ||||
| @@ -315,10 +315,10 @@ var file_github_com_containerd_containerd_api_types_task_task_proto_rawDesc = [] | ||||
| 	0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x53, | ||||
| 	0x54, 0x4f, 0x50, 0x50, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x55, 0x53, | ||||
| 	0x45, 0x44, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x41, 0x55, 0x53, 0x49, 0x4e, 0x47, 0x10, | ||||
| 	0x05, 0x42, 0x31, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x05, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, | ||||
| 	0x74, 0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, | ||||
| 	0x65, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -21,7 +21,7 @@ package containerd.v1.types; | ||||
| import "google/protobuf/timestamp.proto"; | ||||
| import "google/protobuf/any.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types/task"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types/task"; | ||||
|  | ||||
| enum Status { | ||||
| 	UNKNOWN = 0; | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package transfer | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	reflect "reflect" | ||||
| @@ -347,11 +347,11 @@ var file_github_com_containerd_containerd_api_types_transfer_imagestore_proto_ra | ||||
| 	0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, | ||||
| 	0x61, 0x6d, 0x65, 0x64, 0x5f, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, | ||||
| 	0x08, 0x52, 0x0f, 0x73, 0x6b, 0x69, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x64, 0x44, 0x69, 0x67, 0x65, | ||||
| 	0x73, 0x74, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, | ||||
| 	0x73, 0x74, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, | ||||
| 	0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, | ||||
| 	0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| 	0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, | ||||
| 	0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.types.transfer; | ||||
|  | ||||
| import "github.com/containerd/containerd/api/types/platform.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types/transfer"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; | ||||
|  | ||||
| message ImageStore { | ||||
| 	string name = 1; | ||||
|   | ||||
| @@ -22,7 +22,7 @@ | ||||
| package transfer | ||||
|  | ||||
| import ( | ||||
| 	types "github.com/containerd/containerd/api/types" | ||||
| 	types "github.com/containerd/containerd/v2/api/types" | ||||
| 	protoreflect "google.golang.org/protobuf/reflect/protoreflect" | ||||
| 	protoimpl "google.golang.org/protobuf/runtime/protoimpl" | ||||
| 	reflect "reflect" | ||||
| @@ -234,11 +234,11 @@ var file_github_com_containerd_containerd_api_types_transfer_importexport_proto_ | ||||
| 	0x16, 0x73, 0x6b, 0x69, 0x70, 0x5f, 0x6e, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, | ||||
| 	0x62, 0x75, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x73, | ||||
| 	0x6b, 0x69, 0x70, 0x4e, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x61, | ||||
| 	0x62, 0x6c, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, | ||||
| 	0x62, 0x6c, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, | ||||
| 	0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, | ||||
| 	0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, | ||||
| 	0x6f, 0x33, | ||||
| 	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, | ||||
| 	0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -18,7 +18,7 @@ syntax = "proto3"; | ||||
|  | ||||
| package containerd.types.transfer; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types/transfer"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; | ||||
|  | ||||
| import "github.com/containerd/containerd/api/types/platform.proto"; | ||||
|  | ||||
|   | ||||
| @@ -131,11 +131,11 @@ var file_github_com_containerd_containerd_api_types_transfer_progress_proto_rawD | ||||
| 	0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, | ||||
| 	0x28, 0x03, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x14, 0x0a, 0x05, | ||||
| 	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x74, 0x6f, 0x74, | ||||
| 	0x61, 0x6c, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, | ||||
| 	0x61, 0x6c, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, | ||||
| 	0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, | ||||
| 	0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, | ||||
| 	0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||||
| 	0x33, | ||||
| 	0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, | ||||
| 	0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, | ||||
| 	0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -18,7 +18,7 @@ syntax = "proto3"; | ||||
|  | ||||
| package containerd.types.transfer; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types/transfer"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; | ||||
|  | ||||
| message Progress { | ||||
| 	string event = 1; | ||||
|   | ||||
| @@ -399,11 +399,11 @@ var file_github_com_containerd_containerd_api_types_transfer_registry_proto_rawD | ||||
| 	0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, | ||||
| 	0x43, 0x52, 0x45, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x41, 0x4c, 0x53, 0x10, 0x01, 0x12, 0x0b, 0x0a, | ||||
| 	0x07, 0x52, 0x45, 0x46, 0x52, 0x45, 0x53, 0x48, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x48, 0x45, | ||||
| 	0x41, 0x44, 0x45, 0x52, 0x10, 0x03, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, | ||||
| 	0x41, 0x44, 0x45, 0x52, 0x10, 0x03, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, | ||||
| 	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, | ||||
| 	0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, | ||||
| 	0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| 	0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, | ||||
| 	0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, | ||||
| 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -20,7 +20,7 @@ package containerd.types.transfer; | ||||
|  | ||||
| import "google/protobuf/timestamp.proto"; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types/transfer"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; | ||||
|  | ||||
| message OCIRegistry { | ||||
| 	string reference = 1; | ||||
|   | ||||
| @@ -142,11 +142,11 @@ var file_github_com_containerd_containerd_api_types_transfer_streaming_proto_raw | ||||
| 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x0c, | ||||
| 	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, | ||||
| 	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x75, 0x70, | ||||
| 	0x64, 0x61, 0x74, 0x65, 0x42, 0x35, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, | ||||
| 	0x64, 0x61, 0x74, 0x65, 0x42, 0x38, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, | ||||
| 	0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, | ||||
| 	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, | ||||
| 	0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, | ||||
| 	0x74, 0x6f, 0x33, | ||||
| 	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, | ||||
| 	0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, 0x06, | ||||
| 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||||
| } | ||||
|  | ||||
| var ( | ||||
|   | ||||
| @@ -18,7 +18,7 @@ syntax = "proto3"; | ||||
|  | ||||
| package containerd.types.transfer; | ||||
|  | ||||
| option go_package = "github.com/containerd/containerd/api/types/transfer"; | ||||
| option go_package = "github.com/containerd/containerd/v2/api/types/transfer"; | ||||
|  | ||||
| message Data { | ||||
| 	bytes data = 1; | ||||
|   | ||||
| @@ -24,8 +24,8 @@ import ( | ||||
| 	"strings" | ||||
| 	"testing" | ||||
|  | ||||
| 	"github.com/containerd/containerd/archive/compression" | ||||
| 	"github.com/containerd/containerd/pkg/testutil" | ||||
| 	"github.com/containerd/containerd/v2/archive/compression" | ||||
| 	"github.com/containerd/containerd/v2/pkg/testutil" | ||||
| ) | ||||
|  | ||||
| // TestPrefixHeaderReadable tests that files that could be created with the | ||||
|   | ||||
| @@ -29,9 +29,9 @@ import ( | ||||
| 	"syscall" | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd/archive/tarheader" | ||||
| 	"github.com/containerd/containerd/pkg/epoch" | ||||
| 	"github.com/containerd/containerd/pkg/userns" | ||||
| 	"github.com/containerd/containerd/v2/archive/tarheader" | ||||
| 	"github.com/containerd/containerd/v2/pkg/epoch" | ||||
| 	"github.com/containerd/containerd/v2/pkg/userns" | ||||
| 	"github.com/containerd/continuity/fs" | ||||
| 	"github.com/containerd/log" | ||||
| ) | ||||
|   | ||||
| @@ -25,9 +25,9 @@ import ( | ||||
| 	"strings" | ||||
| 	"testing" | ||||
|  | ||||
| 	"github.com/containerd/containerd/mount" | ||||
| 	"github.com/containerd/containerd/pkg/testutil" | ||||
| 	"github.com/containerd/containerd/snapshots/overlay/overlayutils" | ||||
| 	"github.com/containerd/containerd/v2/mount" | ||||
| 	"github.com/containerd/containerd/v2/pkg/testutil" | ||||
| 	"github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" | ||||
| 	"github.com/containerd/continuity/fs" | ||||
| 	"github.com/containerd/continuity/fs/fstest" | ||||
| 	"github.com/containerd/log/logtest" | ||||
|   | ||||
| @@ -32,8 +32,8 @@ import ( | ||||
| 	"testing" | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd/archive/tartest" | ||||
| 	"github.com/containerd/containerd/pkg/testutil" | ||||
| 	"github.com/containerd/containerd/v2/archive/tartest" | ||||
| 	"github.com/containerd/containerd/v2/pkg/testutil" | ||||
| 	"github.com/containerd/continuity/fs" | ||||
| 	"github.com/containerd/continuity/fs/fstest" | ||||
| 	"github.com/opencontainers/go-digest" | ||||
|   | ||||
| @@ -27,7 +27,7 @@ import ( | ||||
| 	"strings" | ||||
| 	"syscall" | ||||
|  | ||||
| 	"github.com/containerd/containerd/pkg/userns" | ||||
| 	"github.com/containerd/containerd/v2/pkg/userns" | ||||
| 	"github.com/containerd/continuity/fs" | ||||
| 	"github.com/containerd/continuity/sysx" | ||||
| 	"golang.org/x/sys/unix" | ||||
|   | ||||
| @@ -26,7 +26,7 @@ import ( | ||||
| 	"strings" | ||||
| 	"sync" | ||||
|  | ||||
| 	"github.com/containerd/containerd/defaults" | ||||
| 	"github.com/containerd/containerd/v2/defaults" | ||||
| ) | ||||
|  | ||||
| var bufPool = sync.Pool{ | ||||
|   | ||||
							
								
								
									
										68
									
								
								client.go
									
									
									
									
									
								
							
							
						
						
									
										68
									
								
								client.go
									
									
									
									
									
								
							| @@ -26,40 +26,40 @@ import ( | ||||
| 	"sync" | ||||
| 	"time" | ||||
|  | ||||
| 	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" | ||||
| 	eventsapi "github.com/containerd/containerd/api/services/events/v1" | ||||
| 	imagesapi "github.com/containerd/containerd/api/services/images/v1" | ||||
| 	introspectionapi "github.com/containerd/containerd/api/services/introspection/v1" | ||||
| 	leasesapi "github.com/containerd/containerd/api/services/leases/v1" | ||||
| 	namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1" | ||||
| 	sandboxsapi "github.com/containerd/containerd/api/services/sandbox/v1" | ||||
| 	snapshotsapi "github.com/containerd/containerd/api/services/snapshots/v1" | ||||
| 	"github.com/containerd/containerd/api/services/tasks/v1" | ||||
| 	versionservice "github.com/containerd/containerd/api/services/version/v1" | ||||
| 	apitypes "github.com/containerd/containerd/api/types" | ||||
| 	"github.com/containerd/containerd/containers" | ||||
| 	"github.com/containerd/containerd/content" | ||||
| 	contentproxy "github.com/containerd/containerd/content/proxy" | ||||
| 	"github.com/containerd/containerd/defaults" | ||||
| 	"github.com/containerd/containerd/errdefs" | ||||
| 	"github.com/containerd/containerd/events" | ||||
| 	"github.com/containerd/containerd/images" | ||||
| 	"github.com/containerd/containerd/leases" | ||||
| 	leasesproxy "github.com/containerd/containerd/leases/proxy" | ||||
| 	"github.com/containerd/containerd/namespaces" | ||||
| 	"github.com/containerd/containerd/pkg/dialer" | ||||
| 	"github.com/containerd/containerd/platforms" | ||||
| 	"github.com/containerd/containerd/plugins" | ||||
| 	ptypes "github.com/containerd/containerd/protobuf/types" | ||||
| 	"github.com/containerd/containerd/remotes" | ||||
| 	"github.com/containerd/containerd/remotes/docker" | ||||
| 	"github.com/containerd/containerd/sandbox" | ||||
| 	sandboxproxy "github.com/containerd/containerd/sandbox/proxy" | ||||
| 	"github.com/containerd/containerd/services/introspection" | ||||
| 	"github.com/containerd/containerd/snapshots" | ||||
| 	snproxy "github.com/containerd/containerd/snapshots/proxy" | ||||
| 	containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" | ||||
| 	contentapi "github.com/containerd/containerd/v2/api/services/content/v1" | ||||
| 	diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" | ||||
| 	eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" | ||||
| 	imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" | ||||
| 	introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1" | ||||
| 	leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" | ||||
| 	namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" | ||||
| 	sandboxsapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" | ||||
| 	snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" | ||||
| 	"github.com/containerd/containerd/v2/api/services/tasks/v1" | ||||
| 	versionservice "github.com/containerd/containerd/v2/api/services/version/v1" | ||||
| 	apitypes "github.com/containerd/containerd/v2/api/types" | ||||
| 	"github.com/containerd/containerd/v2/containers" | ||||
| 	"github.com/containerd/containerd/v2/content" | ||||
| 	contentproxy "github.com/containerd/containerd/v2/content/proxy" | ||||
| 	"github.com/containerd/containerd/v2/defaults" | ||||
| 	"github.com/containerd/containerd/v2/errdefs" | ||||
| 	"github.com/containerd/containerd/v2/events" | ||||
| 	"github.com/containerd/containerd/v2/images" | ||||
| 	"github.com/containerd/containerd/v2/leases" | ||||
| 	leasesproxy "github.com/containerd/containerd/v2/leases/proxy" | ||||
| 	"github.com/containerd/containerd/v2/namespaces" | ||||
| 	"github.com/containerd/containerd/v2/pkg/dialer" | ||||
| 	"github.com/containerd/containerd/v2/platforms" | ||||
| 	"github.com/containerd/containerd/v2/plugins" | ||||
| 	ptypes "github.com/containerd/containerd/v2/protobuf/types" | ||||
| 	"github.com/containerd/containerd/v2/remotes" | ||||
| 	"github.com/containerd/containerd/v2/remotes/docker" | ||||
| 	"github.com/containerd/containerd/v2/sandbox" | ||||
| 	sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy" | ||||
| 	"github.com/containerd/containerd/v2/services/introspection" | ||||
| 	"github.com/containerd/containerd/v2/snapshots" | ||||
| 	snproxy "github.com/containerd/containerd/v2/snapshots/proxy" | ||||
| 	"github.com/containerd/typeurl/v2" | ||||
| 	ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||||
| 	"github.com/opencontainers/runtime-spec/specs-go" | ||||
|   | ||||
| @@ -19,10 +19,10 @@ package containerd | ||||
| import ( | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd/images" | ||||
| 	"github.com/containerd/containerd/platforms" | ||||
| 	"github.com/containerd/containerd/remotes" | ||||
| 	"github.com/containerd/containerd/snapshots" | ||||
| 	"github.com/containerd/containerd/v2/images" | ||||
| 	"github.com/containerd/containerd/v2/platforms" | ||||
| 	"github.com/containerd/containerd/v2/remotes" | ||||
| 	"github.com/containerd/containerd/v2/snapshots" | ||||
| 	ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||||
|  | ||||
| 	"google.golang.org/grpc" | ||||
|   | ||||
| @@ -21,10 +21,10 @@ package main | ||||
| import ( | ||||
| 	"context" | ||||
|  | ||||
| 	"github.com/containerd/containerd/runtime/v2/runc/manager" | ||||
| 	_ "github.com/containerd/containerd/runtime/v2/runc/pause" | ||||
| 	_ "github.com/containerd/containerd/runtime/v2/runc/task/plugin" | ||||
| 	"github.com/containerd/containerd/runtime/v2/shim" | ||||
| 	"github.com/containerd/containerd/v2/runtime/v2/runc/manager" | ||||
| 	_ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" | ||||
| 	_ "github.com/containerd/containerd/v2/runtime/v2/runc/task/plugin" | ||||
| 	"github.com/containerd/containerd/v2/runtime/v2/shim" | ||||
| ) | ||||
|  | ||||
| func main() { | ||||
|   | ||||
| @@ -23,8 +23,8 @@ import ( | ||||
| 	"sync" | ||||
| 	"time" | ||||
|  | ||||
| 	internalapi "github.com/containerd/containerd/integration/cri-api/pkg/apis" | ||||
| 	"github.com/containerd/containerd/pkg/cri/util" | ||||
| 	internalapi "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" | ||||
| 	"github.com/containerd/containerd/v2/pkg/cri/util" | ||||
| 	"github.com/containerd/log" | ||||
| 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1" | ||||
| ) | ||||
|   | ||||
| @@ -29,10 +29,10 @@ import ( | ||||
| 	"strings" | ||||
| 	"syscall" | ||||
|  | ||||
| 	"github.com/containerd/containerd" | ||||
| 	"github.com/containerd/containerd/cio" | ||||
| 	"github.com/containerd/containerd/namespaces" | ||||
| 	"github.com/containerd/containerd/oci" | ||||
| 	"github.com/containerd/containerd/v2" | ||||
| 	"github.com/containerd/containerd/v2/cio" | ||||
| 	"github.com/containerd/containerd/v2/namespaces" | ||||
| 	"github.com/containerd/containerd/v2/oci" | ||||
| 	"github.com/containerd/log" | ||||
| 	"github.com/urfave/cli" | ||||
| ) | ||||
|   | ||||
| @@ -23,9 +23,9 @@ import ( | ||||
| 	"syscall" | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd" | ||||
| 	"github.com/containerd/containerd/cio" | ||||
| 	"github.com/containerd/containerd/oci" | ||||
| 	"github.com/containerd/containerd/v2" | ||||
| 	"github.com/containerd/containerd/v2/cio" | ||||
| 	"github.com/containerd/containerd/v2/oci" | ||||
| 	"github.com/containerd/log" | ||||
| 	specs "github.com/opencontainers/runtime-spec/specs-go" | ||||
| ) | ||||
|   | ||||
| @@ -28,10 +28,10 @@ import ( | ||||
| 	"syscall" | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd" | ||||
| 	"github.com/containerd/containerd/integration/remote" | ||||
| 	"github.com/containerd/containerd/namespaces" | ||||
| 	"github.com/containerd/containerd/plugins" | ||||
| 	"github.com/containerd/containerd/v2" | ||||
| 	"github.com/containerd/containerd/v2/integration/remote" | ||||
| 	"github.com/containerd/containerd/v2/namespaces" | ||||
| 	"github.com/containerd/containerd/v2/plugins" | ||||
| 	"github.com/containerd/log" | ||||
| 	metrics "github.com/docker/go-metrics" | ||||
| 	"github.com/urfave/cli" | ||||
|   | ||||
| @@ -23,9 +23,9 @@ import ( | ||||
| 	"sync" | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd" | ||||
| 	"github.com/containerd/containerd/cio" | ||||
| 	"github.com/containerd/containerd/oci" | ||||
| 	"github.com/containerd/containerd/v2" | ||||
| 	"github.com/containerd/containerd/v2/cio" | ||||
| 	"github.com/containerd/containerd/v2/oci" | ||||
| 	"github.com/containerd/log" | ||||
| ) | ||||
|  | ||||
|   | ||||
| @@ -18,4 +18,4 @@ | ||||
|  | ||||
| package builtins | ||||
|  | ||||
| import _ "github.com/containerd/containerd/snapshots/btrfs/plugin" | ||||
| import _ "github.com/containerd/containerd/v2/snapshots/btrfs/plugin" | ||||
|   | ||||
| @@ -18,33 +18,33 @@ package builtins | ||||
|  | ||||
| // register containerd builtins here | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/diff/walking/plugin" | ||||
| 	_ "github.com/containerd/containerd/events/plugin" | ||||
| 	_ "github.com/containerd/containerd/gc/scheduler" | ||||
| 	_ "github.com/containerd/containerd/leases/plugin" | ||||
| 	_ "github.com/containerd/containerd/metadata/plugin" | ||||
| 	_ "github.com/containerd/containerd/pkg/nri/plugin" | ||||
| 	_ "github.com/containerd/containerd/plugins/imageverifier" | ||||
| 	_ "github.com/containerd/containerd/plugins/sandbox" | ||||
| 	_ "github.com/containerd/containerd/plugins/streaming" | ||||
| 	_ "github.com/containerd/containerd/plugins/transfer" | ||||
| 	_ "github.com/containerd/containerd/runtime/restart/monitor" | ||||
| 	_ "github.com/containerd/containerd/runtime/v2" | ||||
| 	_ "github.com/containerd/containerd/services/containers" | ||||
| 	_ "github.com/containerd/containerd/services/content" | ||||
| 	_ "github.com/containerd/containerd/services/diff" | ||||
| 	_ "github.com/containerd/containerd/services/events" | ||||
| 	_ "github.com/containerd/containerd/services/healthcheck" | ||||
| 	_ "github.com/containerd/containerd/services/images" | ||||
| 	_ "github.com/containerd/containerd/services/introspection" | ||||
| 	_ "github.com/containerd/containerd/services/leases" | ||||
| 	_ "github.com/containerd/containerd/services/namespaces" | ||||
| 	_ "github.com/containerd/containerd/services/opt" | ||||
| 	_ "github.com/containerd/containerd/services/sandbox" | ||||
| 	_ "github.com/containerd/containerd/services/snapshots" | ||||
| 	_ "github.com/containerd/containerd/services/streaming" | ||||
| 	_ "github.com/containerd/containerd/services/tasks" | ||||
| 	_ "github.com/containerd/containerd/services/transfer" | ||||
| 	_ "github.com/containerd/containerd/services/version" | ||||
| 	_ "github.com/containerd/containerd/services/warning" | ||||
| 	_ "github.com/containerd/containerd/v2/diff/walking/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/events/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/gc/scheduler" | ||||
| 	_ "github.com/containerd/containerd/v2/leases/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/metadata/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/pkg/nri/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/plugins/imageverifier" | ||||
| 	_ "github.com/containerd/containerd/v2/plugins/sandbox" | ||||
| 	_ "github.com/containerd/containerd/v2/plugins/streaming" | ||||
| 	_ "github.com/containerd/containerd/v2/plugins/transfer" | ||||
| 	_ "github.com/containerd/containerd/v2/runtime/restart/monitor" | ||||
| 	_ "github.com/containerd/containerd/v2/runtime/v2" | ||||
| 	_ "github.com/containerd/containerd/v2/services/containers" | ||||
| 	_ "github.com/containerd/containerd/v2/services/content" | ||||
| 	_ "github.com/containerd/containerd/v2/services/diff" | ||||
| 	_ "github.com/containerd/containerd/v2/services/events" | ||||
| 	_ "github.com/containerd/containerd/v2/services/healthcheck" | ||||
| 	_ "github.com/containerd/containerd/v2/services/images" | ||||
| 	_ "github.com/containerd/containerd/v2/services/introspection" | ||||
| 	_ "github.com/containerd/containerd/v2/services/leases" | ||||
| 	_ "github.com/containerd/containerd/v2/services/namespaces" | ||||
| 	_ "github.com/containerd/containerd/v2/services/opt" | ||||
| 	_ "github.com/containerd/containerd/v2/services/sandbox" | ||||
| 	_ "github.com/containerd/containerd/v2/services/snapshots" | ||||
| 	_ "github.com/containerd/containerd/v2/services/streaming" | ||||
| 	_ "github.com/containerd/containerd/v2/services/tasks" | ||||
| 	_ "github.com/containerd/containerd/v2/services/transfer" | ||||
| 	_ "github.com/containerd/containerd/v2/services/version" | ||||
| 	_ "github.com/containerd/containerd/v2/services/warning" | ||||
| ) | ||||
|   | ||||
| @@ -17,10 +17,10 @@ | ||||
| package builtins | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/metrics/cgroups" | ||||
| 	_ "github.com/containerd/containerd/metrics/cgroups/v2" | ||||
| 	_ "github.com/containerd/containerd/runtime/v2/runc/options" | ||||
| 	_ "github.com/containerd/containerd/snapshots/blockfile/plugin" | ||||
| 	_ "github.com/containerd/containerd/snapshots/native/plugin" | ||||
| 	_ "github.com/containerd/containerd/snapshots/overlay/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/metrics/cgroups" | ||||
| 	_ "github.com/containerd/containerd/v2/metrics/cgroups/v2" | ||||
| 	_ "github.com/containerd/containerd/v2/runtime/v2/runc/options" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/native/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" | ||||
| ) | ||||
|   | ||||
| @@ -19,6 +19,6 @@ | ||||
| package builtins | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/snapshots/blockfile/plugin" | ||||
| 	_ "github.com/containerd/containerd/snapshots/native/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/native/plugin" | ||||
| ) | ||||
|   | ||||
| @@ -17,8 +17,8 @@ | ||||
| package builtins | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/diff/lcow" | ||||
| 	_ "github.com/containerd/containerd/diff/windows" | ||||
| 	_ "github.com/containerd/containerd/snapshots/lcow" | ||||
| 	_ "github.com/containerd/containerd/snapshots/windows" | ||||
| 	_ "github.com/containerd/containerd/v2/diff/lcow" | ||||
| 	_ "github.com/containerd/containerd/v2/diff/windows" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/lcow" | ||||
| 	_ "github.com/containerd/containerd/v2/snapshots/windows" | ||||
| ) | ||||
|   | ||||
| @@ -19,5 +19,5 @@ | ||||
| package builtins | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/pkg/cri" | ||||
| 	_ "github.com/containerd/containerd/v2/pkg/cri" | ||||
| ) | ||||
|   | ||||
| @@ -18,4 +18,4 @@ | ||||
|  | ||||
| package builtins | ||||
|  | ||||
| import _ "github.com/containerd/containerd/snapshots/devmapper/plugin" | ||||
| import _ "github.com/containerd/containerd/v2/snapshots/devmapper/plugin" | ||||
|   | ||||
| @@ -19,5 +19,5 @@ | ||||
| package builtins | ||||
|  | ||||
| import ( | ||||
| 	_ "github.com/containerd/containerd/tracing/plugin" | ||||
| 	_ "github.com/containerd/containerd/v2/tracing/plugin" | ||||
| ) | ||||
|   | ||||
| @@ -21,12 +21,12 @@ import ( | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
|  | ||||
| 	"github.com/containerd/containerd/defaults" | ||||
| 	"github.com/containerd/containerd/images" | ||||
| 	"github.com/containerd/containerd/pkg/timeout" | ||||
| 	"github.com/containerd/containerd/plugin/registry" | ||||
| 	"github.com/containerd/containerd/services/server" | ||||
| 	srvconfig "github.com/containerd/containerd/services/server/config" | ||||
| 	"github.com/containerd/containerd/v2/defaults" | ||||
| 	"github.com/containerd/containerd/v2/images" | ||||
| 	"github.com/containerd/containerd/v2/pkg/timeout" | ||||
| 	"github.com/containerd/containerd/v2/plugin/registry" | ||||
| 	"github.com/containerd/containerd/v2/services/server" | ||||
| 	srvconfig "github.com/containerd/containerd/v2/services/server/config" | ||||
| 	ocispec "github.com/opencontainers/image-spec/specs-go/v1" | ||||
| 	"github.com/pelletier/go-toml/v2" | ||||
| 	"github.com/urfave/cli" | ||||
|   | ||||
| @@ -27,14 +27,14 @@ import ( | ||||
| 	"runtime" | ||||
| 	"time" | ||||
|  | ||||
| 	"github.com/containerd/containerd/defaults" | ||||
| 	"github.com/containerd/containerd/errdefs" | ||||
| 	_ "github.com/containerd/containerd/metrics" // import containerd build info | ||||
| 	"github.com/containerd/containerd/mount" | ||||
| 	"github.com/containerd/containerd/services/server" | ||||
| 	srvconfig "github.com/containerd/containerd/services/server/config" | ||||
| 	"github.com/containerd/containerd/sys" | ||||
| 	"github.com/containerd/containerd/version" | ||||
| 	"github.com/containerd/containerd/v2/defaults" | ||||
| 	"github.com/containerd/containerd/v2/errdefs" | ||||
| 	_ "github.com/containerd/containerd/v2/metrics" // import containerd build info | ||||
| 	"github.com/containerd/containerd/v2/mount" | ||||
| 	"github.com/containerd/containerd/v2/services/server" | ||||
| 	srvconfig "github.com/containerd/containerd/v2/services/server/config" | ||||
| 	"github.com/containerd/containerd/v2/sys" | ||||
| 	"github.com/containerd/containerd/v2/version" | ||||
| 	"github.com/containerd/log" | ||||
| 	"github.com/urfave/cli" | ||||
| 	"google.golang.org/grpc/grpclog" | ||||
|   | ||||
| @@ -23,7 +23,7 @@ import ( | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
|  | ||||
| 	"github.com/containerd/containerd/services/server" | ||||
| 	"github.com/containerd/containerd/v2/services/server" | ||||
| 	"github.com/containerd/log" | ||||
| 	"golang.org/x/sys/unix" | ||||
| ) | ||||
|   | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user
	 Akihiro Suda
					Akihiro Suda