Merge pull request containerd#1364 from katiewasnothere/local_introsp…

…ection add introspection service to cri plugin
AkihiroSuda · Jan 6, 2020 · 55566f9 · 55566f9
2 parents ff8a2e7 + 63d2a04
commit 55566f9
Show file tree

Hide file tree

Showing 107 changed files with 12,257 additions and 734 deletions.
diff --git a/cri.go b/cri.go
@@ -24,6 +24,7 @@ import (
 	"github.com/containerd/containerd/api/services/containers/v1"
 	"github.com/containerd/containerd/api/services/diff/v1"
 	"github.com/containerd/containerd/api/services/images/v1"
+	introspectionapi "github.com/containerd/containerd/api/services/introspection/v1"
 	"github.com/containerd/containerd/api/services/namespaces/v1"
 	"github.com/containerd/containerd/api/services/tasks/v1"
 	"github.com/containerd/containerd/content"
@@ -146,6 +147,9 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) {
 		services.LeasesService: func(s interface{}) containerd.ServicesOpt {
 			return containerd.WithLeasesService(s.(leases.Manager))
 		},
+		services.IntrospectionService: func(s interface{}) containerd.ServicesOpt {
+			return containerd.WithIntrospectionService(s.(introspectionapi.IntrospectionClient))
+		},
 	} {
 		p := plugins[s]
 		if p == nil {

diff --git a/vendor.conf b/vendor.conf
@@ -44,14 +44,17 @@ github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
 github.com/containerd/go-runc 9007c2405372fe28918845901a3276c0915689a1
 github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
 github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
-github.com/containerd/containerd 383f4a77eeb726e0b7da491c70ad22b10f3b2bff
+github.com/containerd/containerd 5fc0f30167216f7b11de904df4df8b1c96290104
 github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
-github.com/containerd/cgroups abd0b19954a6b05e0963f48427062d1481b7faad
+github.com/containerd/cgroups fada802a7909d430bd17126fd6e4bbf5716f2bcd
 github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 github.com/Microsoft/hcsshim d2849cbdb9dfe5f513292a9610ca2eb734cdd1e7
 github.com/Microsoft/go-winio v0.4.14
 github.com/BurntSushi/toml v0.3.1
 
+# cgroups dependencies
+github.com/cilium/ebpf 60c3aa43f488292fe2ee50fb8b833b383ca8ebbb
+
 # kubernetes dependencies
 sigs.k8s.io/yaml v1.1.0
 k8s.io/utils e782cd3c129fc98ee807f3c889c0f26eb7c9daf5

diff --git a/vendor/github.com/cilium/ebpf/LICENSE b/vendor/github.com/cilium/ebpf/LICENSE
diff --git a/vendor/github.com/cilium/ebpf/abi.go b/vendor/github.com/cilium/ebpf/abi.go