github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
5,560 Commits 3 Branches 4 Tags
f3652d0682f500a84191b34cd58e37e6fd684c36
Commit Graph

354 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
4c38278895 vendor: update containerd/cri c0294ebfe0 
full diff: 19589b4bf9...c0294ebfe0

- containerd/cri#1387 vendor: bump gopkg.in/yaml.v2 v2.2.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-02-04 09:32:09 +01:00
Phil Estes
a1e0303e7a Merge pull request #3978 from dims/sync-with-latest-containerd-cri-master-including-selinux-change 
Sync with latest changes in containerd/cri
 2020-01-25 23:41:13 +02:00
Davanum Srinivas
0dc69620b8 update dependencies of containerd/cri 
List generated by running:
`git diff c9d45e6526 19589b4bf9 vendor.conf`

in the containerd/cri repositoru

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-01-25 14:20:17 -05:00
Davanum Srinivas
53ced5ffe1 update to latest containerd/cri (master) 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-01-25 14:20:11 -05:00
Davanum Srinivas
faf03c3d23 Pick up fix for CVE-2019-16884 in opencontainers/selinux 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-01-25 14:19:59 -05:00
Davanum Srinivas
923c05bed1 Bump to opencontainers/runc new version - v1.0.0-rc10 
We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-19921 as well. The full
diff upstream is here:
https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-01-24 10:13:56 -05:00
Paul "TBBle" Hampson
45a17cffb6 Vendor Microsoft/hcsshim with CGO removal 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-01-19 06:07:10 +11:00
Shengjing Zhu
22b73a9a78 vendor: bump containerd/btrfs to 153935315f4ab9be5bf03650a1341454b05efa5d 
Fix building issue on mipsle

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-17 10:57:48 +08:00
Sebastiaan van Stijn
2f0db8e2a8 vendor: bump prometheus/client_golang v1.3.0 
full diff: https://github.com/prometheus/client_golang/compare/v1.1.0...v1.3.0

This requires LK4D/vndr v0.1.0 or newer for vendoring; also adds a new
dependency: github.com/cespare/xxhash

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 17:00:24 +01:00
Sebastiaan van Stijn
e10c911876 vendor: bump prometheus/client_golang v1.1.0 
full diff: https://github.com/prometheus/client_golang/compare/v0.9.4...v1.1.0

Using v1.1.0, because version v1.2.0 and up use versioned import paths for the
github.com/cespare/xxhash/v2 dependency (prometheus/client_golang#657), which
causes vendoring with vndr to break due to the v2 in the import-path.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:43:31 +01:00
Sebastiaan van Stijn
845b91d6b5 vendor: bump prometheus/client_golang v0.9.4 
full diff: f4fb1b73fb...v0.9.4

version v0.9.0 is the minimum tagged version to work with go-metrics v0.0.1,
as it depends on `prometheus.Observer`:

    vendor/github.com/docker/go-metrics/timer.go:39:4: undefined: prometheus.Observer

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:43:29 +01:00
Sebastiaan van Stijn
04506b87d6 vendor: bump docker/go-metrics v0.0.1: 
full diff: 4ea375f775...v0.0.1

- docker/go-metrics#15 Add functions that instruments http handler using promhttp
- docker/go-metrics#20 Rename LICENSE.code → LICENSE
- docker/go-metrics#22 Support Go Modules

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:43:20 +01:00
Sebastiaan van Stijn
99911ea668 vendor: bump prometheus/procfs v0.0.8 
full diff: cb4147076a...v0.0.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:11:53 +01:00
Sebastiaan van Stijn
ed6ae81861 vendor: bump prometheus/common v0.7.0 
full diff: 89604d1970...v0.7.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:10:10 +01:00
Sebastiaan van Stijn
c02dc24ecf vendor: bump prometheus/client_model v0.1.0 
full diff: 99fa1f4be8...v0.1.0

- prometheus/client_model#22 add `go_package`, regenerate Go binding file
- prometheus/client_model#31 Support Go Modules
- prometheus/client_model#38 Remove all languages but Go and add a deprecation note

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:08:24 +01:00
Sebastiaan van Stijn
77a3780c25 vendor: bump beorn7/perks v1.0.1 
full diff: 4c0e84591b...v1.0.1

- beorn7/perks#3 Avoid iterating on maps
    - Speed up InsertTargeted* functions by at least 2x by avoiding iterating on maps.
- beorn7/perks#4 Fixed format error
- Use 1000000 instead of 1e6 for int constant
- Add go module support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-13 15:05:45 +01:00
Akihiro Suda
e1221e69a8 revendor containerd/cgroups 
Note: now vndr >= v0.10 is required (https://github.com/containerd/cgroups/issues/139)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-01-13 16:09:59 +09:00
wawa0210
4d62d8795c bump microsoft/hcsshim to 0.8.7 
Signed-off-by: 张潇 <xiaozhang0210@hotmail.com>
 2020-01-11 13:45:30 +08:00
Shengjing Zhu
465c11dc87 Fix build with gccgo 
+ archive: don't convert syscall.Timespec to unix.Timespec
  archive/tar_unix.go:179:76: error: invalid type conversion (cannot use type syscall.Timespec as type unix.Timespec)
    179 |  timespec := []unix.Timespec{unix.Timespec(fs.StatAtime(st)), unix.Timespec(fs.StatMtime(st))}
+ gccgo has no plugin support
  https://github.com/golang/go/issues/36403
+ update github.com/containerd/continuity
  to include same fix for Timespec

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2020-01-07 19:28:26 +08:00
Phil Estes
496836c092 Update containerd/console vendor for fix 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-12-20 11:33:11 -05:00
Akihiro Suda
8f870c233f support cgroup2 
* only shim v2 runc v2 ("io.containerd.runc.v2") is supported
* only PID metrics is implemented. Others should be implemented in separate PRs.
* lots of code duplication in v1 metrics and v2 metrics. Dedupe should be separate PR.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-12-12 02:56:51 +09:00
Phil Estes
e8948e11aa Merge pull request #3878 from crosbymichael/bump-console 
Bump containerd console for os.File changes
 2019-12-06 18:48:51 -05:00
Michael Crosby
9d5a095b00 Bump containerd console for os.File changes 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-12-06 13:46:47 -05:00
Michael Crosby
cd23ad2447 Bump go-runc for buffer race fix 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-12-06 11:40:50 -05:00
Derek McGowan
3e5402ce02 Merge pull request #3852 from estesp/update-vendors 
Update cri and docker vendors
 2019-11-26 12:00:04 -08:00
Phil Estes
252d6550f5 Update cri and docker vendors 
Update cri and docker to recent commits for mips enablement

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-11-26 09:46:46 -05:00
Sebastiaan van Stijn
8a66dc6edb bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def 
full diff: e029b79d8c...a2952bc25f

- containerd/go-runc#56 fix typo in successfully

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-11-26 14:54:26 +01:00
Akihiro Suda
a2688b972c bring back aufs and zfs 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-10-30 17:51:27 +09:00
Phil Estes
aeec80fca1 Merge pull request #3773 from Random-Liu/use-logrus-trace 
Use logrus trace support.
 2019-10-25 07:45:31 -04:00
Lantao Liu
20e844a227 Use logrus trace support. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-10-24 20:12:19 -07:00
Derek McGowan
66aa1d3ef6 Add snapshot walk implementations 
Temporarily remove zfs and aufs until interface update

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-10-24 11:11:22 -07:00
Justin Terry (VM)
37b56cafc6 Add ctr metrics support for Windows/LCOW containers 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-10-23 13:50:34 -07:00
Justin Terry (VM)
178469e2ae Update Microsoft/hcsshim vendor 
Updates Microsoft/hcsshim vendor commit hash to a recent version that now:
1. Supports container stats via the Stats RuntimeV2 gRPC call.
2. Fixes a regression when issuing a resize of the pty after the container has
exited which previously in Docker was expected to be a non-error case.
3. Puts in a workaround when using a non-default sandbox size for Windows
containers due to a platform bug. This expansion now happens in the go library
itself.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
 2019-10-23 11:48:43 -07:00
Wei Fu
074b453ac6 vendor: call vndr to remove useless pkgs and update vendor 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-10-18 17:49:22 +08:00
Michael Crosby
f277665edb Bump runc to 1b8a1eeec3f337ab5d94f28980 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-03 10:36:35 -04:00
Phil Estes
309c9c25ba Merge pull request #3706 from mrueg/enable-autocmpl 
ctr: Enable shell autocompletion
 2019-10-03 09:15:51 -04:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages 
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-01 10:19:56 -04:00
Manuel Rüger
b5fa55b0c2 ctr: Enable shell autocompletion 
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
 2019-10-01 09:43:21 +02:00
Michael Crosby
95dbbdc8c1 Bump runc for CVE-2019-16884 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-26 10:09:42 -04:00
Lantao Liu
fc31fa176d Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-23 17:51:26 -07:00
Derek McGowan
5bb0281d16 Fix missing vendor packages 
The switch to urfave/cli had a use of a /v2 API, which
go modules handles correctly but vndr ignores. Downgrade
urfave/cli for now until the switch to go modules. Add
missing dependencies, which vndr now sees.
Note that CI was not catching this issue, it seems that
some part of the build process was pulling in dependencies
even if they weren't in vendor, causing the build to work.
However the vendor check was not seeing it. The ARM build
didn't pull in other dependencies into the gopath, causing
those builds to break.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-09-12 18:35:40 -07:00
Michael Crosby
f3a5b8c0a9 Add command to generate man pages 
The climan package has a command that can be registered with any urfav
cli app to generate man pages.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-11 15:31:02 -04:00
Michael Crosby
424d33c5b7 Update go-runc to e029b79d8cda8374981c64eba71f28e 
Includes fix for user namespaces and NOTIFY_SOCKET.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-09-11 11:20:34 -04:00
Lantao Liu
61f113e608 Automate CRI tarball release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-09-09 10:48:52 -07:00
Derek McGowan
d540b10c75 Merge pull request #3607 from awesomenix/updatecri 
Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6
 2019-09-04 13:42:29 -07:00
Michael Crosby
f76eefd272 Merge pull request #3574 from mxpv/cfg 
Support config imports
 2019-09-04 16:34:11 -04:00
Nishchay Kumar
b6c811b7a4 Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6 
Signed-off-by: Nishchay Kumar <mrawesomenix@gmail.com>
 2019-08-30 11:32:52 -07:00
Akihiro Suda
a292bf0f24 bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251 
31af176f2a...2ceb2dbb81

Fix containerd/zfs#22

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2019-08-29 14:28:54 +09:00
Michael Crosby
97962976a4 Update ttrpc to 92c8520ef9f86600c650dd540266a00 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-28 14:00:13 -04:00
Sebastiaan van Stijn
2f54a7cb6b bump containerd/ttrpc 9abb3e268010ea188f4e4051f77eb5aca49315fb 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-08-26 23:24:22 +02:00