Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit d64edd3

Browse files
dimsdims
committed
Sync vendors with containerd 1.3.2
Look through the `containerd dependencies` in vendor.conf, for each dependency / SHA, check if the SHA is newer in containerd's vendor.conf in 1.3.2 tag. Update if necessary. Drop unused packages. Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 5d01a3a commit d64edd3

294 files changed

Lines changed: 26780 additions & 2107 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎vendor.conf‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ github.com/docker/docker 86f080cff0914e9694068ed78d503701667c4c00
55
github.com/docker/distribution 0d3efadf0154c2b8a4e7b6621fff9809655cc580
66

77
# containerd dependencies
8-
go.etcd.io/bbolt 2eb7227adea1d5cf85f0bc2a82b7059b13c2fa68
9-
google.golang.org/grpc 25c4f928eaa6d96443009bd842389fb4fa48664e # v1.20.1
8+
go.etcd.io/bbolt v1.3.3
9+
google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb # v1.23.0
1010
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
1111
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
12-
golang.org/x/sys 4c4f7f33c9ed00de01c4c741d2177abfcfe19307 https://github.com/golang/sys
12+
golang.org/x/sys 9eafafc0a87e0fd0aeeba439a4573537970c44c7 https://github.com/golang/sys
1313
golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
1414
golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
15-
github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
15+
github.com/urfave/cli v1.22.0
1616
github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
1717
github.com/sirupsen/logrus v1.4.1
1818
github.com/prometheus/procfs cb4147076ac75738c9a7d279075a253c0cc5acbd
@@ -21,33 +21,38 @@ github.com/prometheus/client_model 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
2121
github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
2222
github.com/pkg/errors v0.8.1
2323
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db
24-
github.com/opencontainers/runc f4982d86f7fde0b6f953cc62ccc4022c519a10a9 # v1.0.0-rc8-32-gf4982d86
24+
github.com/opencontainers/runc d736ef14f0288d6993a1845745d6756cfc9ddd5a # v1.0.0-rc9
2525
github.com/opencontainers/image-spec v1.0.1
2626
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
2727
github.com/matttproud/golang_protobuf_extensions v1.0.1
28-
github.com/grpc-ecosystem/go-grpc-prometheus v1.1
29-
github.com/google/uuid v1.1.1
28+
github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 # v1.1
3029
github.com/golang/protobuf v1.2.0
3130
github.com/gogo/protobuf v1.2.1
3231
github.com/gogo/googleapis v1.2.0
33-
github.com/godbus/dbus v3
32+
github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f # v3
3433
github.com/docker/go-units v0.4.0
3534
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
3635
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
37-
github.com/coreos/go-systemd v14
36+
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 # v14
3837
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
3938
github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
4039
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
4140
github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
4241
github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
43-
github.com/containerd/containerd d4802a64f9737f02db3426751f380d97fc878dec
42+
github.com/containerd/containerd v1.3.2
4443
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
4544
github.com/containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
4645
github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
4746
github.com/Microsoft/hcsshim 9e921883ac929bbe515b39793ece99ce3a9d7706
4847
github.com/Microsoft/go-winio v0.4.14
4948
github.com/BurntSushi/toml v0.3.1
50-
github.com/imdario/mergo v0.3.7
49+
go.opencensus.io v0.22.0
50+
github.com/hashicorp/golang-lru v0.5.3
51+
google.golang.org/appengine v1.5.0
52+
github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4 # v1.1.1
53+
github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19 # v1.0.10
54+
github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a # v1.5.2
55+
github.com/imdario/mergo 7c29201646fa3de8506f701213473dd407f19646 # v0.3.7
5156

5257
# kubernetes dependencies
5358
sigs.k8s.io/yaml v1.1.0

‎vendor/github.com/containerd/containerd/cmd/containerd/command/service_unsupported.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.

‎vendor/github.com/containerd/containerd/cmd/containerd/command/service_windows.go‎

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

‎vendor/github.com/containerd/containerd/diff/apply/apply_linux.go‎

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

‎vendor/github.com/containerd/containerd/diff/stream.go‎

Lines changed: 2 additions & 2 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.

‎vendor/github.com/containerd/containerd/images/image.go‎

Lines changed: 4 additions & 79 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/mediatypes.go‎

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

0 commit comments

Comments
 (0)