From 4c2ad9cefb2f712e35f676dd929697498daccd77 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Mon, 16 Jul 2018 17:03:20 -0700 Subject: [PATCH] Update CRI vendor Signed-off-by: Derek McGowan --- vendor.conf | 2 +- vendor/github.com/containerd/cri/cri.go | 4 ++-- .../containerd/cri/pkg/containerd/importer/importer.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vendor.conf b/vendor.conf index 91b5ba454..263709be7 100644 --- a/vendor.conf +++ b/vendor.conf @@ -43,7 +43,7 @@ gotest.tools v2.1.0 github.com/google/go-cmp v0.1.0 # cri dependencies -github.com/containerd/cri v1.11.0 +github.com/containerd/cri 661f3b0377db409fe0e5677115f02ce7b89fd17d https://github.com/dmcgowan/cri-containerd github.com/containerd/go-cni 5882530828ecf62032409b298a3e8b19e08b6534 github.com/blang/semver v3.1.0 github.com/containernetworking/cni v0.6.0 diff --git a/vendor/github.com/containerd/cri/cri.go b/vendor/github.com/containerd/cri/cri.go index b51b284de..ba94ebc4e 100644 --- a/vendor/github.com/containerd/cri/cri.go +++ b/vendor/github.com/containerd/cri/cri.go @@ -24,10 +24,10 @@ 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" - "github.com/containerd/containerd/api/services/leases/v1" "github.com/containerd/containerd/api/services/namespaces/v1" "github.com/containerd/containerd/api/services/tasks/v1" "github.com/containerd/containerd/content" + "github.com/containerd/containerd/leases" "github.com/containerd/containerd/log" "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/plugin" @@ -137,7 +137,7 @@ func getServicesOpts(ic *plugin.InitContext) ([]containerd.ServicesOpt, error) { return containerd.WithNamespaceService(s.(namespaces.NamespacesClient)) }, services.LeasesService: func(s interface{}) containerd.ServicesOpt { - return containerd.WithLeasesService(s.(leases.LeasesClient)) + return containerd.WithLeasesService(s.(leases.Manager)) }, } { p := plugins[s] diff --git a/vendor/github.com/containerd/cri/pkg/containerd/importer/importer.go b/vendor/github.com/containerd/cri/pkg/containerd/importer/importer.go index 5b25bf9bd..aab872215 100644 --- a/vendor/github.com/containerd/cri/pkg/containerd/importer/importer.go +++ b/vendor/github.com/containerd/cri/pkg/containerd/importer/importer.go @@ -103,7 +103,7 @@ func Import(ctx context.Context, client *containerd.Client, reader io.Reader) (_ defer deferCancel() if err := done(deferCtx); err != nil { // Get lease id from context still works after context is done. - leaseID, _ := leases.Lease(ctx) + leaseID, _ := leases.FromContext(ctx) log.G(ctx).WithError(err).Errorf("Failed to release lease %q", leaseID) } }()