Commit Graph

169 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
cc493eba3f vendor: containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff
full diff: 0dbf7f05ba...318312a373

relevant changes:

- cpuset: typo fix for function name
- Retry file writes on EINTR errors to work with Go 1.14 asynchronous preemption
- Various linting issues and cleanup

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-13 14:54:05 +02:00
Mike Brown
d7e59b141c enable removecontainer to forcibly remove containers
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-05 12:47:43 -05:00
Davanum Srinivas
963625d7bc Update runc to v1.0.0-rc91
https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc91

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-07-04 14:46:03 -04:00
Michael Crosby
785f4c5cd9 Bump CRI for 1.4x release
includes selinux bump.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-06-15 16:07:00 -04:00
Davanum Srinivas
e64b14820e Revendor CRI to 62c91260d2
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-02 15:27:39 -04:00
Akihiro Suda
2f601013e6 cgroup2: implement containerd.events.TaskOOM event
How to test (from https://github.com/opencontainers/runc/pull/2352#issuecomment-620834524):
  (host)$ sudo swapoff -a
  (host)$ sudo ctr run -t --rm --memory-limit $((1024*1024*32)) docker.io/library/alpine:latest foo
  (container)$ sh -c 'VAR=$(seq 1 100000000)'

An event `/tasks/oom {"container_id":"foo"}` will be displayed in `ctr events`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-06-01 14:00:13 +09:00
Maksym Pavlenko
62fd1750e2 Revendor CRI to 8898550e34
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-05-29 14:34:27 -07:00
Michael Crosby
c5273930bd Update CRI to 52c2c6b5df
This bump contains updates for CRI with selinux support.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-05-26 21:06:18 -04:00
Phil Estes
f13ba8f2f2 Merge pull request #4247 from thaJeztah/bump_continuity
vendor: containerd/continuity, containerd/fifo, containerd/go-runc
2020-05-12 10:41:02 -04:00
Sebastiaan van Stijn
3e7bbb8a49 vendor: update containerd/cri, remove "docker/distribution" dependency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-12 15:00:51 +02:00
Sebastiaan van Stijn
f09e999099 vendor: containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c
full diff: a5c2862aed...7016d3ce23

- add go.mod
- Parse runc version even if commit is missing

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 23:13:39 +02:00
Sebastiaan van Stijn
d9d1d5b624 vendor: containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf
full diff: bda0ff6ed7...f15a329036

- add go.mod
- replace "golang.org/x/net/context"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 23:11:33 +02:00
Sebastiaan van Stijn
c5078a5b72 vendor: containerd/continuity d3ef23f19fbb106bb73ffde425d07a9187e30745
full diff: 0ec596719c...d3ef23f19f

- fs: support for OpenBSD
- sysx/xattr: fix and improve
- remove Windows' Readlink fork

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 23:02:40 +02:00
Sebastiaan van Stijn
2c77dc63a4 vendor: update containerd/cri to current master
- Remove dependency on libcontainer/system
- Get rid of socat for port forwarding
- Roll docker/distribution back to latest (v2.7.1) release
  Now that 901bcb2231 was merged in containerd,
  we no longer depend on the ParseDockerRef utility from docker/distribution,
  so we can safely roll back to the latest release for this dependency.
- vendor: kubernetes v1.18.2
  Fix client watch reestablishment handling of client-side timeouts
- Add config flag to default empty seccomp profile

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-11 09:09:39 +02:00
Michael Crosby
ed261720c8 Update ttrpc/typeurl to v1.0.1
This updates the two packages to their released versions.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-05-08 14:31:31 -04:00
Wei Fu
ae7cdc814b vendor: update containerd/cri
Commit ID: 65830369b6 from master

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-05-03 10:44:49 +08:00
ktock
046a520c91 vendor: update containerd/cri dc7afe8fbe
full diff: 61b7af7564...dc7afe8fbe

This commit includes moving up to the latest critools(1.18.0).

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-04-29 14:49:54 +09:00
Wei Fu
126e497e63 vendor: update ttrpc with 6e416eafd26e6e738df716b21d421d5b59702bb4
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-04-20 23:35:18 +08:00
ktock
e79d666cdd vendor: update containerd/cri 61b7af7564
full diff: 92cb4ed978..61b7af7564

This adds new dependency github.com/fsnotify/fsnotify since 4ce334aa49

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-04-17 12:31:30 +09:00
Kazuyoshi Kato
3261fb5c49 vendor: containerd/cgroups b4448137398923af7f4918b8b2ad8249172ca7a6
full diff: 7347743e5d...b444813739

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-04-03 11:54:48 -07:00
Sebastiaan van Stijn
c00cf9a670 vendor: containerd/cri 92cb4ed978
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-12 23:15:45 +01:00
Sebastiaan van Stijn
12c7d69769 vendor: update containerd/cri 1a00c06886
full diff: c0294ebfe0...1a00c06886

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:14 +01:00
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
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
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
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
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
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
Lantao Liu
fc31fa176d Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-23 17:51:26 -07: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
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
Michael Crosby
0ab7f03fee Merge pull request #3528 from dmcgowan/overlay-direct-unpack
Add direct unpack support for overlay
2019-08-19 10:26:48 -04:00
Lantao Liu
9cbd18ac76 Update cri to f1d492b0cd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-16 16:38:22 -07:00
Derek McGowan
5a0ff41c81 Update continuity vendor
Pulls in copy and fstest changes

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-16 15:49:47 -07:00