github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update containerd to 70e0c8443f.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2017-11-27 19:08:32 +00:00
parent 50cb8a0571
commit 2e3c510c92
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/versions
View File

@ -1,5 +1,5 @@
RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4 RUNC_VERSION=74a17296470088de3805e138d3d87c62e613dfc4
CNI_VERSION=v0.6.0 CNI_VERSION=v0.6.0
CONTAINERD_VERSION=4af5f657526a8aa5eedef734f5f29152031b1d3a CONTAINERD_VERSION=70e0c8443ff15dcbd2ad8e0d07ed087fc2a83e05
CRITOOL_VERSION=4cd2b047a26a2ef01bbd02ee55f7d70d8825ebb5 CRITOOL_VERSION=4cd2b047a26a2ef01bbd02ee55f7d70d8825ebb5
KUBERNETES_VERSION=164317879bcd810b97e5ebf1c8df041770f2ff1b KUBERNETES_VERSION=164317879bcd810b97e5ebf1c8df041770f2ff1b

2
vendor.conf
View File

@ -2,7 +2,7 @@ github.com/blang/semver v3.1.0
github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895 github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
github.com/containerd/cgroups f7dd103d3e4e696aa67152f6b4ddd1779a3455a9 github.com/containerd/cgroups f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
github.com/containerd/containerd 4af5f657526a8aa5eedef734f5f29152031b1d3a github.com/containerd/containerd 70e0c8443ff15dcbd2ad8e0d07ed087fc2a83e05
github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e
github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788

6
vendor/github.com/containerd/containerd/client.go generated vendored
View File

@ -133,7 +133,7 @@ func (c *Client) Containers(ctx context.Context, filters ...string) ([]Container
// NewContainer will create a new container in container with the provided id // NewContainer will create a new container in container with the provided id
// the id must be unique within the namespace // the id must be unique within the namespace
func (c *Client) NewContainer(ctx context.Context, id string, opts ...NewContainerOpts) (Container, error) { func (c *Client) NewContainer(ctx context.Context, id string, opts ...NewContainerOpts) (Container, error) {
ctx, done, err := c.withLease(ctx) ctx, done, err := c.WithLease(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -214,7 +214,7 @@ func (c *Client) Pull(ctx context.Context, ref string, opts ...RemoteOpt) (Image
} }
store := c.ContentStore() store := c.ContentStore()
ctx, done, err := c.withLease(ctx) ctx, done, err := c.WithLease(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -587,7 +587,7 @@ func (c *Client) Import(ctx context.Context, ref string, reader io.Reader, opts
return nil, err return nil, err
} }
ctx, done, err := c.withLease(ctx) ctx, done, err := c.WithLease(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
vendor/github.com/containerd/containerd/image.go generated vendored
View File

@ -86,6 +86,12 @@ func (i *image) IsUnpacked(ctx context.Context, snapshotterName string) (bool, e
} }
func (i *image) Unpack(ctx context.Context, snapshotterName string) error { func (i *image) Unpack(ctx context.Context, snapshotterName string) error {
ctx, done, err := i.client.WithLease(ctx)
if err != nil {
return err
}
defer done()
layers, err := i.getLayers(ctx, platforms.Default()) layers, err := i.getLayers(ctx, platforms.Default())
if err != nil { if err != nil {
return err return err

3
vendor/github.com/containerd/containerd/lease.go generated vendored
View File

@ -51,7 +51,8 @@ func (c *Client) ListLeases(ctx context.Context) ([]Lease, error) {
return leases, nil return leases, nil
} }
func (c *Client) withLease(ctx context.Context) (context.Context, func() error, error) { // WithLease attaches a lease on the context
func (c *Client) WithLease(ctx context.Context) (context.Context, func() error, error) {
_, ok := leases.Lease(ctx) _, ok := leases.Lease(ctx)
if ok { if ok {
return ctx, func() error { return ctx, func() error {

2
vendor/github.com/containerd/containerd/task.go generated vendored
View File

@ -356,7 +356,7 @@ func (t *task) Resize(ctx context.Context, w, h uint32) error {
} }
func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Image, error) { func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointTaskOpts) (Image, error) {
ctx, done, err := t.client.withLease(ctx) ctx, done, err := t.client.WithLease(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }