Commit Graph

6207 Commits

Author SHA1 Message Date
Derek McGowan
f35f21dd0b
Add CRI release functionality to makefile
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-23 14:10:27 -07:00
Phil Estes
4e5ce76ee0
Merge pull request #4579 from iamleot/netbsd-support
Add support for NetBSD
2020-09-22 17:24:45 -04:00
Mike Brown
38f799d000
Merge pull request #4577 from dmcgowan/remove-travis
Remove unused Travis configuration
2020-09-22 16:05:32 -05:00
Leonardo Taccari
4c47fe0a2f Add support for NetBSD
Signed-off-by: Leonardo Taccari <leot@NetBSD.org>
2020-09-22 20:03:50 +02:00
Derek McGowan
3216a16959
Remove unused Travis configuration
Remove related stale cri release files

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-21 21:15:42 -07:00
Phil Estes
534be84c5d
Merge pull request #4529 from gongguan/creator
avoid unnecessary NewCreator calls
2020-09-21 13:33:51 -04:00
Phil Estes
68d97331be
Merge pull request #4538 from fuweid/update-shim-cleanup
runtime/v2: cleanup dead shim before delete bundle
2020-09-21 13:32:40 -04:00
Guanjun Gong
0dea724fc0 NewTask avoid unnecessary cio.NewCreator calls
Signed-off-by: Guanjun Gong <gongguanjun@hotmail.com>
2020-09-21 11:45:37 +08:00
Wei Fu
4b05d03903 runtime/v2: cleanup dead shim before delete bundle
The shim delete action needs bundle information to cleanup resources
created by shim. If the cleanup dead shim is called after delete bundle,
the part of resources maybe leaky.

The ttrpc client UserOnCloseWait() can make sure that resources are
cleanup before delete bundle, which synchronizes task deletion and
cleanup deadshim. It might slow down the task deletion, but it can make
sure that resources can be cleanup and avoid EBUSY umount case. For
example, the sandbox container like Kata/Firecracker might have mount
points over the rootfs. If containerd handles task deletion and cleanup
deadshim parallelly, the task deletion will meet EBUSY during umount and
fail to cleanup bundle, which makes case worse.

And also update cleanupAfterDeadshim, which makes sure that
cleanupAfterDeadshim must be called after shim disconnected. In some
case, shim fails to call runc-create for some reason, but the runc-create
already makes runc-init into ready state. If containerd doesn't call shim
deletion, the runc-init process will be leaky and hold the cgroup, which
makes pod terminating :(.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-09-20 11:24:31 +08:00
Derek McGowan
438c87b8e0
Merge pull request #4534 from sedflix/zfs-root-path
zfs: seperate implementation pkg from plugin pkg
2020-09-18 10:28:23 -07:00
Derek McGowan
fc2240915a
Merge pull request #4527 from mikebrow/prow-test-pr
k8s cri prow build test
2020-09-18 09:59:02 -07:00
Phil Estes
1484593ee9
Merge pull request #4533 from sedflix/aufs-seperate-plugin
feat(snapshot::aufs): config root_path
2020-09-18 10:18:31 -04:00
Siddharth Yadav
96f4ce4a5c zfs: seperate implementation pkg from plugin pkg and revendor
Signed-off-by: Siddharth Yadav <sedflix@gmail.com>
2020-09-18 18:49:12 +05:30
Siddharth Yadav
2354e187c3 aufs: seperate implementation pkg from plugin pkg and revendor
Signed-off-by: Siddharth Yadav <sedflix@gmail.com>
2020-09-18 18:37:23 +05:30
Phil Estes
2575a73307
Merge pull request #4573 from teemuteemu/separate-devmapper-plugin
Separate devmapper plugin
2020-09-18 08:08:30 -04:00
Teemu Kallio
71fd68a920 devicemapper: seperate implementation pkg from plugin pkg
Signed-off-by: Teemu Kallio <teemu.kallio@pm.me>
2020-09-18 12:00:14 +02:00
Mike Brown
30615c6fed testing out k8s prow test move
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-09-17 17:31:18 -05:00
Phil Estes
d6774b6392
Merge pull request #4570 from ktock/vendor-cri
vendor: update containerd/cri 210a86ca5b
2020-09-17 09:28:56 -04:00
ktock
309b5e623c vendor: update containerd/cri 210a86ca5b
This includes the fix for additional labels passed to snapshotter.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-09-17 14:32:01 +09:00
Akihiro Suda
2991bc3de7
Merge pull request #4569 from dmcgowan/update-containerd-latest
Update latest release in RELEASES.md
2020-09-16 19:54:41 +09:00
Derek McGowan
331678c1eb
Update latest release in RELEASES.md
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-15 19:10:12 -07:00
Phil Estes
373cbc2a7f
Merge pull request #4544 from schrej/patch-1
cr: fix checkpoint from image getting skipped
2020-09-15 20:11:08 -04:00
Michael Crosby
585a19a769
Merge pull request #4566 from thaJeztah/bitset_1.1.11
vendor: github.com/willf/bitset v1.1.11
2020-09-15 14:44:33 -04:00
Sebastiaan van Stijn
a6fc9ca490
vendor: github.com/willf/bitset v1.1.11
The changes needed by opencontainers/selinux are now in a tagged
release. This will make our dependency slightly ahead of what's
used by opencontainers/selinux until a v1.6.1 is tagged.

full diff: https://github.com/willf/bitset/compare/d5bec3311243...v1.1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-15 15:14:04 +02:00
Maksym Pavlenko
5b3ac0c86f
Merge pull request #4050 from thaJeztah/bump_golang_1.14
Update to golang 1.15.2
2020-09-14 09:42:13 -07:00
Phil Estes
bb6590da80
Merge pull request #4559 from bsdnet/master
Refractor the script to work in both python2 and python3
2020-09-11 22:39:01 -04:00
Derek McGowan
9efd738181
Merge pull request #4546 from cpuguy83/consume_shim_log
Always consume shim logs
2020-09-11 14:37:05 -07:00
Roy Yang
9e094abd08 Refractor the script to work in both python2 and python3
Signed-off-by: Roy Yang <royyang@google.com>
2020-09-11 13:53:33 -07:00
Sebastiaan van Stijn
d1c8d98658
update to golang 1.15.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-11 09:21:25 +02:00
Brian Goff
dab7bd0c45 Always consume shim logs
These fifos fill up if unconsumed, so always consume them.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-10 10:23:29 -07:00
Phil Estes
bc4c381399
Merge pull request #4550 from thaJeztah/bump_cgroups
vendor: containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510
2020-09-10 10:46:50 -04:00
Phil Estes
5d7aa0cb65
Merge pull request #4549 from ukontainer/fix-missing-sha256
fix `make test` failure of missing sha256 package
2020-09-10 10:46:10 -04:00
Akihiro Suda
c862000ab9
Merge pull request #4548 from darfux/ret_error_if_metric_fails
ctr: Return error if task.Metrics fails
2020-09-10 20:00:33 +09:00
Sebastiaan van Stijn
d44673eb28
vendor: containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510
full diff: 318312a373...0b889c03f1

Relevant changes:

- v1/stats: add all fields of memory.oom_control
- memory: remove wrong memory.kmem.limit_in_bytes check

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 12:33:43 +02:00
Hajime Tazaki
f4741fb8c5 fix make test failure of missing sha256 package
Fixes: c50ff694 ("refactor(native): separate init from implementation")

Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
2020-09-10 18:50:49 +09:00
Li Yuxuan
bdb5b2ce47 ctr: Return error if task.Metrics fails
Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2020-09-10 16:42:35 +08:00
Jakob
ab5d93187c cr: fix checkpoint from image getting skipped
Fix restoring from a checkpoint image always getting skipped when no checkpoint image path is set. As one restores either from an image OR a path, this makes no sense.

Signed-off-by: Jakob Schrettenbrunner <dev@schrej.net>
2020-09-08 16:44:03 +00:00
Phil Estes
d43d546a8d
Merge pull request #4540 from pbxqdown/master
Fix ctr command typo.
2020-09-08 08:31:01 -04:00
Qian Xiao
469b637358 Fix ctr command typo.
Signed-off-by: Qian Xiao <heyheyco@gmail.com>
2020-09-07 15:50:52 -07:00
Wei Fu
fabebe5d55
Merge pull request #4530 from tianon/rpi-armv6
Add RPi1/RPi0 workaround
2020-09-06 11:49:13 +08:00
Wei Fu
7ce23867e3
Merge pull request #4532 from cpuguy83/forward_signal_not_found
Fix some signal forwarder issues
2020-09-06 11:41:51 +08:00
Brian Goff
899b4e3cb5 Ignore SIGURG signals in signal forwarder
Starting with go1.14, the go runtime hijacks SIGURG but with no way to
not send to other signal handlers.

In practice, we get this signal frequently.
I found this while testing out go1.15 with ctr and multiple execs with
only `echo hello`. When the process exits quickly, if the previous
commit is not applied, you end up with an error message that it couldn't
forward SIGURG to the container (due to the process being gone).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-04 16:19:31 -07:00
Brian Goff
6650510836 Exit signal forward if process not found
Previously the signal loop can end up racing with the process exiting.
Intead of logging and continuing the loop, exit early.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-04 16:17:00 -07:00
Tianon Gravi
2055e12953 Add RPi1/RPi0 workaround
On the very popular Raspberry Pi 1 and Zero devices, the CPU is actually ARMv6, but the chip happens to support the feature bit the kernel uses to differentiate v6/v7, so it gets reported as "CPU architecture: 7" and thus fails to run many of the images that get pulled.

To account for this very popular edge case, this also checks "model name" which on these chips will begin with "ARMv6-compatible" -- we could also check uname, but getCPUInfo is already handy, low overhead, and mirrors the code before this.

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-09-04 14:19:37 -07:00
Derek McGowan
d4e78200d6
Merge pull request #4518 from knight42/feat/btrfs-config-root-path
feat(snapshot::btrfs): config root_path
2020-09-03 11:12:27 -07:00
Derek McGowan
445e26fff4
Merge pull request #4517 from knight42/feat/native-config-root-path
feat(snapshot::native): config root_path
2020-09-03 11:10:37 -07:00
Phil Estes
a5c6381558
Merge pull request #4523 from errordeveloper/master
Log unexpected responses
2020-09-03 11:00:55 -04:00
Ilya Dmitrichenko
2de55060ee
Log unexpected responses
This accomplishes a few long-standing TODO items, but also helps users
in showing exact registry error messages

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
2020-09-03 14:52:11 +01:00
Phil Estes
43394312cb
Merge pull request #4525 from shishir-a412ed/seccomp
ctr: CLI Flag (seccomp-profile) for setting custom seccomp profile.
2020-09-03 09:14:30 -04:00
Jian Zeng
c50ff694f0
refactor(native): separate init from implementation
Part of #4513

Signed-off-by: Jian Zeng <anonymousknight96@gmail.com>
2020-09-03 19:58:31 +08:00