Commit Graph

8778 Commits

Author SHA1 Message Date
Akihiro Suda
91a49b6a24
Merge pull request #4583 from thaJeztah/bump_console_v1.0.1
vendor: containerd/console v1.0.1, golang.org/x/sys 2334cc1a136f0a5b4384f1a27e3634457be08553
2020-09-26 18:38:42 +09:00
Derek McGowan
65df8db289
Remove sudo from installation and cri release
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-25 14:40:59 -07:00
Derek McGowan
4e0b13544e
Update CRI tests to build and push to gcs
This enables to the CRI e2e tests to use the build from a PR

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-25 14:12:57 -07:00
Kevin Parsons
a043c0dc3d Update github.com/Microsoft/hcsshim to v0.8.10
Brings in a variety of changes, mostly to the containerd shim.

There is also a change to the Windows layer unpack code which fixes #4301.

Release link: https://github.com/microsoft/hcsshim/releases/tag/v0.8.10

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-09-25 09:28:53 -07:00
Mike Brown
6d2731834c
Merge pull request #1587 from thaJeztah/bump_containerd_v1.4.1
vendor: containerd/containerd v1.4.1
2020-09-24 17:29:44 -05:00
Sebastiaan van Stijn
8b5cc2e1dc
vendor: containerd/console v1.0.1
full diff: https://github.com/containerd/consolve/compare/v1.0.0...v1.0.1

vendor golang.org/x/sys 2334cc1a136f0a5b4384f1a27e3634457be08553

full diff: ed371f2e16...2334cc1a13

- unix: add Darwin support for clonefile syscalls
- Adds openat2 for linux
  openat2 is a new syscall added to Linux 5.6. It provides a superset of
  openat(2) functionality, extending it with flags telling the kernel how
  to resolve the paths.

  For more info, see https://lwn.net/Articles/803237/

  NOTE that this is a second attempt to add the call; the previous one
  (https://golang.org/cl/227280) was reverted
  (https://golang.org/cl/227846) due to the test case failure on ARM
  (https://golang.org/issue/38357).

  This CL has the test case reworked to be less assumptive to the testing
  environment. In particular, it first tries if the most simplistic
  openat2() call succeeds, and skips the test otherwise. It is done that
  way because CI can be under under different kernels and in various
  envrionments -- in particular, Docker+seccomp can result in EPERM from a
  system call (which is not expected otherwise).

  For previous discussions about the test case, see
  https://golang.org/cl/227865.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-24 23:34:18 +02:00
Sebastiaan van Stijn
9f61affa09
vendor: containerd/containerd v1.4.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-24 23:25:07 +02:00
Mike Brown
c988d797be
Merge pull request #1372 from cofyc/update-config-syntax
update config syntax in registry.md
2020-09-24 15:59:56 -05:00
Mike Brown
2c2dd59f32
Merge branch 'master' into update-config-syntax 2020-09-24 15:58:39 -05:00
Mike Brown
b3678ddad2
Merge pull request #1562 from dims/update-to-latest-k8s-1.19.0-release
Update to latest k8s 1.19.2 release
2020-09-24 15:46:28 -05:00
Mike Brown
b1ee4c0d7b
Merge pull request #1570 from yoheiueda/masked
Set masked and readonly paths based on default Unix spec
2020-09-24 15:45:58 -05:00
Derek McGowan
ce4439a815
Merge pull request #4582 from dmcgowan/set-1.2-EOL-date
Set 1.2.x end of life date to October 15
2020-09-24 13:16:01 -07:00
Derek McGowan
281069cbb5
Set 1.2.x end of life date in RELEASES.md
The maintainers discussed extending the end of life date for 1.2
to allow time for EOL announcement and migration to 1.3.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-24 11:48:12 -07:00
Maksym Pavlenko
efc67b192d
Merge pull request #4580 from dmcgowan/move-release-build-makefile
Move CRI release logic to Makefile
2020-09-23 16:41:10 -07:00
Derek McGowan
241be70250
Move github releases to use Makefile for cri release
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-09-23 14:10:27 -07:00
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
Mike Brown
c178043f6b
Merge pull request #1584 from containerd/revert-1530-fix-doc-for-runtime-options
Revert "Fix doc for runtime specific options"
2020-09-22 09:09:50 -05:00
Akihiro Suda
0762fdd9e2
Revert "Fix doc for runtime specific options"
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-09-22 17:23:19 +09:00
Sebastiaan van Stijn
e2928124d1
pkg/server: make ensureRemoveAll() an alias for os.RemoveAll() on Windows
The tricks performed by ensureRemoveAll only make sense for Linux and
other Unices, so separate it out, and make ensureRemoveAll for Windows
just an alias of os.RemoveAll.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-22 10:11:46 +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
Davanum Srinivas
da4a8aea15
Update to latest kubernetes v1.19.2
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-09-17 12:37:19 -04: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
Michael Crosby
210a86ca5b
Merge pull request #1578 from thaJeztah/bitset_1.1.11
vendor: github.com/willf/bitset v1.1.11
2020-09-15 14:43:49 -04:00
Mike Brown
ffe79709e4
Merge pull request #1572 from ktock/layers
Limit size of additional annotation for avoiding unpack failure
2020-09-15 11:50:52 -05:00
Sebastiaan van Stijn
407c3eba2e
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 17:59:09 +02:00
ktock
e571fd864f Limit value size of additional annotation for avoiding unpack failure
In containerd, there is a size limit for label size (4096 chars).
Currently if an image has many layers (> (4096-39)/72 > 56),
`containerd.io/snapshot/cri.image-layers` will hit the limit of label size and
the unpack will fail.
This commit fixes this by limiting the size of the annotation.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-09-15 22:47:28 +09: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
Phil Estes
109853ace2
Merge pull request #1577 from vteratipally/master
Make script work for both python2.7 and 3.6
2020-09-15 08:47:32 -04:00
varsha teratipally
bf3dcfe3a8 Make script work for both python2.7 and 3.6
Signed-off-by: Varsha Teratipally <teratipally@google.com>
2020-09-15 00:29:12 +00: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