Commit Graph

436 Commits

Author SHA1 Message Date
Phil Estes
6fb56aa58b
Update btrfs vendor for chkptr fix for Go >= 1.14
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-11-11 14:13:26 -05:00
Sebastiaan van Stijn
1146098421
replace pkg/symlink with moby/sys/symlink
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 00:05:15 +01:00
Derek McGowan
5184bccea3
Merge pull request #4631 from dims/copy-a-few-packages-from-moby/moby
Copy pkg/symlink and pkg/truncindex from moby/moby
2020-10-29 09:13:30 -07:00
Benjamin Elder
502d6adc22 Revender latest containerd/fifo
fixes build on arm64

Signed-off-by: Benjamin Elder <bentheelder@google.com>
2020-10-26 14:53:35 -07:00
Maksym Pavlenko
5afc4b4d8b Revendor latest containerd/fifo
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2020-10-26 09:04:21 -07:00
Davanum Srinivas
a9cb22309a
Copy pkg/symlink and pkg/truncindex from moby/moby
moby/moby SHA : 9c15e82f19b0ad3c5fe8617a8ec2dddc6639f40a

github.com/docker/docker/pkg/truncindex/truncindex.go -> pkg/cri/store/truncindex/truncindex.go
github.com/docker/docker/pkg/symlink/LICENSE.APACHE -> pkg/symlink/LICENSE.APACHE
github.com/docker/docker/pkg/symlink/LICENSE.BSD -> pkg/symlink/LICENSE.BSD
github.com/docker/docker/pkg/symlink/README.md -> pkg/symlink/README.md
github.com/docker/docker/pkg/symlink/fs.go -> pkg/symlink/fs.go
github.com/docker/docker/pkg/symlink/fs_unix.go -> pkg/symlink/fs_unix.go
github.com/docker/docker/pkg/symlink/fs_windows.go -> pkg/symlink/fs_windows.go

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-10-15 08:36:35 -04:00
Davanum Srinivas
4044ca9a57
trying docker v19.03.13
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-10-13 10:36:42 -04:00
Akihiro Suda
f44b072781
Merge pull request #4593 from dmcgowan/merge-cri
Merge cri master
2020-10-08 03:41:03 +09:00
Derek McGowan
1c60ae7f87
Use local version of cri packages
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-07 10:59:40 -07:00
Maksym Pavlenko
d0f6895d8d Revendor NRI
Signed-off-by: Maksym Pavlenko <mxpv@apple.com>
2020-10-07 10:34:48 -07:00
Sebastiaan van Stijn
0714e4be98
vendor: sirupsen/logrus v1.7.0
full diff: https://github.com/sirupsen/logrus/compare/v1.6.0...v1.7.0

removes dependency on github.com/konsorten/go-windows-terminal-sequences

Features:
   * a new buffer pool management API has been added
   * a set of `<LogLevel>Fn()` functions have been added

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-30 13:44:50 +02:00
Akihiro Suda
84aacd583a
Merge pull request #4585 from kevpar/update-hcsshim-vendor
Update github.com/Microsoft/hcsshim to v0.8.10
2020-09-26 18:39:33 +09: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
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
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
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
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
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
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
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
Michael Crosby
a2b4745f7d update cri to 35e623e6bf
This includes changes for kata or other kvm based runtimes with selinux support.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-09-02 09:46:35 -05:00
Michael Crosby
bacf07f4a5
Merge pull request #4308 from aojea/bumpcni
bump cni dependencies
2020-08-25 11:54:53 -04:00
Derek McGowan
ac95f27b83
Update CRI
Add CRI with NRI support

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-24 14:26:08 -07:00
Antonio Ojea
e3d27f9ed8 bump cni version to v0.8.0
bump cni dependencies so we can benefits from its
bugfixes and improvements

Signed-off-by: Antonio Ojea <antonio.ojea.garcia@gmail.com>
2020-08-21 19:55:13 +02:00
Sebastiaan van Stijn
a1736f98a5
vendor: containerd/cri 4e6644c8cf
full diff: 8871d5cdf8...4e6644c8cf

- Bump Golang 1.13.15
- Bump containerd v1.4.0 rc.0
- vendor: kubernetes 1.19.0 rc.4 and dependencies

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-11 10:11:05 +02:00
Sebastiaan van Stijn
aa40ebb417
vendor: json-iterator/go v1.1.10
full diff: https://github.com/json-iterator/go/compare/v1.1.9...v1.1.10

- Fix 459 map keys of custom types should serialize using MarshalText when available
- Fix potential panic in (*stringAny).ToInt64 and (*stringAny).ToUint64 (see 450)
- Fix 449 do NOT marshal the field whose name start with underscore
- Reuse stream buffer and remove flush in (*Stream).WriteMore(see 441 440)
- Fix 421 simplify the error string returned by the decoder when it meets error unmarshaling anonymous structs
- Fix 389 411 do NOT marshal the json.RawMessage type field whose real type is integer/float as "null" with ValidateJsonRawMessage option enabled
- Fix 326 do Not marshal private field after calling extra.SetNamingStrategy() to register naming strategy extension

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-11 09:57:36 +02:00
Akihiro Suda
8433602989
update runc to v1.0.0-rc92
Changes: https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc92

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-08-06 20:31:33 +09:00
Akihiro Suda
362b7167a7
vendor: update cri (no more libseccomp cgo dependency)
8448b92d23...8871d5cdf8

The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is
always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:32:08 +09:00
Wei Fu
4a96be9795
Merge pull request #4431 from TBBle/import_manifest_for_test_binary
Import Windows manifest into test build, rather than copying by script
2020-07-30 23:13:15 +08:00
Akihiro Suda
779ef60231
Merge pull request #4435 from tao12345666333/update-runc
vendor runc library to v1.0.0-rc91-48-g67169a9d
2020-07-30 13:10:51 +09:00
Jintao Zhang
b870231854 vendor runc library to v1.0.0-rc91-48-g67169a9d
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-29 14:52:48 +08:00
Paul "TBBle" Hampson
aa56cfc0a8 Import Windows manifest into test build, rather than copying by script
This will ensure that we can always get the current Windows OS build
version, without being put into Windows 8 compatibility mode.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-29 06:02:35 +10:00
Sebastiaan van Stijn
5b1627410d
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
full diff: d3ef23f19f...efbc4488d8

Fix sameFile() to recognize empty files as the same
  - fixes "Empty files can diff as "modified" even when they're not"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-28 16:39:35 +02:00
Michael Crosby
3611efdcef update cri to 8448b92d23
This includes an update of the selinux package and the ability in the CRI
configuration to set the upper bounds for the selinux category labels that are
generated.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-23 17:11:18 -04:00
Akihiro Suda
1a7bbd1f71
vendor: update containerd/cri
Changes: 8fb244a65b...fcda0cf4a7

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-20 13:14:11 +09:00
Davanum Srinivas
212c29833f
Updates to go-systemd and selinux
caught these when i was looking at cadvisor's deps.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-07-15 17:08:34 -04:00
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
Sebastiaan van Stijn
a6dd1f27d9
update urfave/cli v1.22.1, go-md2man v2.0.0, blackfriday v2.0.1
This updates urfave/cli and its dependencies to v1.22.1:

- diff for urfave/cli: https://github.com/urfave/cli/compare/v1.22.0...v1.22.1
- diff for go-md2man: https://github.com/cpuguy83/go-md2man/compare/v1.0.10...v2.0.0
- diff for blackfriday: https://github.com/russross/blackfriday/compare/v1.5.2...v2.0.1

Also adds github.com/shurcooL/sanitized_anchor_name as a new dependency, which is
used by russross/blackfriday, but will be removed again in a future update (dependency
is already removed on the v2 branch through russross/blackfriday@919b1f5b9b

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-02 10:48:45 +02: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