Skip to content

Commit f704282

Browse files
tonistiigitonistiigi
authored
Merge pull request moby#1182 from dmcgowan/update-containerd-1.3
Update to containerd 1.3.0
2 parents 10cef0c + 46e7bc8 commit f704282

24 files changed

Lines changed: 375 additions & 390 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
1010
github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601 // indirect
1111
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50
12-
github.com/containerd/containerd v1.3.0-rc.2
12+
github.com/containerd/containerd v1.3.0
1313
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6
1414
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c // indirect
1515
github.com/containerd/go-cni v0.0.0-20190813230227-49fbd9b210f3

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLE
1616
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 h1:WMpHmC6AxwWb9hMqhudkqG7A/p14KiMnl6d3r1iUMjU=
1717
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
1818
github.com/containerd/containerd v1.2.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
19-
github.com/containerd/containerd v1.3.0-rc.2 h1:gQzUVr7bJHFUnqNfSPDkqiuQKTHZxHsJ9jf53ol+tHA=
20-
github.com/containerd/containerd v1.3.0-rc.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
19+
github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY=
20+
github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
2121
github.com/containerd/continuity v0.0.0-20181001140422-bd77b46c8352/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
2222
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 h1:NmTXa/uVnDyp0TY5MKi197+3HWcnYWfnHGyaFthlnGw=
2323
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=

‎hack/dockerfiles/test.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG RUNC_VERSION=v1.0.0-rc8
2-
ARG CONTAINERD_VERSION=v1.3.0-rc.2
2+
ARG CONTAINERD_VERSION=v1.3.0
33
# containerd v1.2 for integration tests
4-
ARG CONTAINERD_OLD_VERSION=v1.2.9
4+
ARG CONTAINERD_OLD_VERSION=v1.2.10
55
# available targets: buildkitd, buildkitd.oci_only, buildkitd.containerd_only
66
ARG BUILDKIT_TARGET=buildkitd
77
ARG REGISTRY_VERSION=v2.7.0-rc.0

‎hack/dockerfiles/test.buildkit.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# syntax = docker/dockerfile:1.1-experimental
22

33
ARG RUNC_VERSION=v1.0.0-rc8
4-
ARG CONTAINERD_VERSION=v1.3.0-rc.2
4+
ARG CONTAINERD_VERSION=v1.3.0
55
# containerd v1.2 for integration tests
6-
ARG CONTAINERD_OLD_VERSION=v1.2.9
6+
ARG CONTAINERD_OLD_VERSION=v1.2.10
77
# available targets: buildkitd, buildkitd.oci_only, buildkitd.containerd_only
88
ARG BUILDKIT_TARGET=buildkitd
99
ARG REGISTRY_VERSION=v2.7.0-rc.0

‎util/leaseutil/manager.go‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import (
55
"time"
66

77
"github.com/containerd/containerd/leases"
8-
"github.com/containerd/containerd/metadata"
98
"github.com/containerd/containerd/namespaces"
10-
bolt "go.etcd.io/bbolt"
119
)
1210

1311
func WithLease(ctx context.Context, ls leases.Manager, opts ...leases.Opt) (context.Context, func(context.Context) error, error) {
@@ -29,81 +27,6 @@ func WithLease(ctx context.Context, ls leases.Manager, opts ...leases.Opt) (cont
2927
}, nil
3028
}
3129

32-
func NewManager(mdb *metadata.DB) leases.Manager {
33-
return &local{db: mdb}
34-
}
35-
36-
type local struct {
37-
db *metadata.DB
38-
}
39-
40-
func (l *local) Create(ctx context.Context, opts ...leases.Opt) (leases.Lease, error) {
41-
var lease leases.Lease
42-
if err := l.db.Update(func(tx *bolt.Tx) error {
43-
var err error
44-
lease, err = metadata.NewLeaseManager(tx).Create(ctx, opts...)
45-
return err
46-
}); err != nil {
47-
return leases.Lease{}, err
48-
}
49-
return lease, nil
50-
}
51-
52-
func (l *local) Delete(ctx context.Context, lease leases.Lease, opts ...leases.DeleteOpt) error {
53-
if err := l.db.Update(func(tx *bolt.Tx) error {
54-
return metadata.NewLeaseManager(tx).Delete(ctx, lease, opts...)
55-
}); err != nil {
56-
return err
57-
}
58-
59-
return nil
60-
}
61-
62-
func (l *local) AddResource(ctx context.Context, lease leases.Lease, r leases.Resource) error {
63-
if err := l.db.Update(func(tx *bolt.Tx) error {
64-
return metadata.NewLeaseManager(tx).AddResource(ctx, lease, r)
65-
}); err != nil {
66-
return err
67-
}
68-
69-
return nil
70-
}
71-
72-
func (l *local) DeleteResource(ctx context.Context, lease leases.Lease, r leases.Resource) error {
73-
if err := l.db.Update(func(tx *bolt.Tx) error {
74-
return metadata.NewLeaseManager(tx).AddResource(ctx, lease, r)
75-
}); err != nil {
76-
return err
77-
}
78-
79-
return nil
80-
}
81-
82-
func (l *local) ListResources(ctx context.Context, lease leases.Lease) ([]leases.Resource, error) {
83-
var res []leases.Resource
84-
if err := l.db.Update(func(tx *bolt.Tx) error {
85-
var err error
86-
res, err = metadata.NewLeaseManager(tx).ListResources(ctx, lease)
87-
return err
88-
}); err != nil {
89-
return nil, err
90-
}
91-
92-
return res, nil
93-
}
94-
95-
func (l *local) List(ctx context.Context, filters ...string) ([]leases.Lease, error) {
96-
var ll []leases.Lease
97-
if err := l.db.View(func(tx *bolt.Tx) error {
98-
var err error
99-
ll, err = metadata.NewLeaseManager(tx).List(ctx, filters...)
100-
return err
101-
}); err != nil {
102-
return nil, err
103-
}
104-
return ll, nil
105-
}
106-
10730
func WithNamespace(lm leases.Manager, ns string) leases.Manager {
10831
return &nsLM{Manager: lm, ns: ns}
10932
}

‎vendor/github.com/containerd/containerd/.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/RELEASES.md‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/images/archive/importer.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)