github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,706 Commits 3 Branches 2 Tags 112 MiB
6be7c9f4e2
Commit Graph

8706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Fu
c8523cc5bb
Merge pull request #4470 from AkihiroSuda/fix-static-plugin 
BUILDING.md: fix description about static builds
 2020-08-23 16:39:10 +08:00
Wei Fu
35d320c7ae
Merge pull request #4490 from dmcgowan/makefile-test-tags 
Update go list to respect build tags
 2020-08-23 16:37:13 +08:00
Akihiro Suda
09cab88da4
Merge pull request #4481 from tao12345666333/add-openat2-syscall 
seccomp: add `openat2` and `faccessat2` syscall.
 2020-08-23 07:26:25 +09: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
Derek McGowan
3275a216fd
Update go list to respect build tags 
This prevents packages with no Go included files due to build constraints
being included in the package list. These packages cause the test command
to fail with "can't load package build constraints exclude all Go files".

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-21 09:39:00 -07:00
Antonio Ojea
1403a391c3 bump cni dependencies 
Signed-off-by: Antonio Ojea <aojea@redhat.com>
 2020-08-21 18:00:20 +02:00
Michael Crosby
db687ff485 Add --runtime-root to ctr 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-21 04:55:28 -04:00
Mike Brown
bb0ca842e9
Merge pull request #1559 from mikebrow/prepare-1.4 
Prepare 1.4
 2020-08-20 12:16:29 -05:00
Phil Estes
412378ff02
Merge pull request #4437 from kzys/fix-rollback 
snapshots/devmapper: fix rollback
 2020-08-20 08:41:51 -04:00
Michael Crosby
63f89eb954 Update server with nri injection points 
This allows development with container to be done for NRI without the need for
custom builds.

This is an experimental feature and is not enabled unless a user has a global
`/etc/nri/conf.json` config setup with plugins on the system.  No NRI code will
be executed if this config file does not exist.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-20 08:10:09 -04:00
Michael Crosby
b777982928 Update vendor for new containerd and nri 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-08-20 07:28:37 -04:00
Mike Brown
b0cc07999a vendor containerd 1.4 release 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-20 05:14:45 -05:00
Mike Brown
a40d639285 update support table for 1.4 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-20 05:13:47 -05:00
Li Yuxuan
4422ae3638 tasks: Monitor v2 tasks in initFunc as well 
When containerd is restarted, only v1 tasks are monitored again. This
leads to the lack of existing v2 task metrics.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2020-08-19 20:32:31 +08:00
Kazuyoshi Kato
a1f6c9dd88 snapshots/devmapper: fix rollback 
The rollback mechanism is implemented by calling deleteDevice() and
RemoveDevice(). But RemoveDevice() is internally calling
deleteDevice() as well.

Since a device will be deleted by first deleteDevice(),
RemoveDevice() always will see ENODATA. The specific error must be
ignored to remove the device's metadata correctly.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2020-08-17 15:41:03 -07:00
Wei Fu
6c74c391fd
Merge pull request #4475 from thaJeztah/minor_systemd_updates 
systemd: use LimitNOFILE=infinity instead of hard-coded max value
 2020-08-18 00:15:14 +08:00
Derek McGowan
09814d48d5
Merge pull request #4479 from dmcgowan/prepare-1.4.0 
Prepare v1.4.0
 2020-08-17 07:41:32 -07:00
Jintao Zhang
6a915a1453 seccomp: add faccessat2 syscall. 
related to https://patchwork.kernel.org/patch/11545287/

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2020-08-17 21:48:21 +08:00
Derek McGowan
d68ddb0c0a
Prepare v1.4.0 
Update release notes form rc to GA.
Update mailmap
Update version

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-16 22:56:31 -07:00
Derek McGowan
6be2eccd72
Update releases page for v1.4.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-16 22:56:31 -07:00
Jintao Zhang
e28e55f455 seccomp: add openat2 syscall. 
related to https://patchwork.kernel.org/patch/11167585/

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2020-08-16 16:28:21 +08:00
Phil Estes
298f43663a
Merge pull request #4480 from AkihiroSuda/disable-vagrant-crun 
CI: disable crun on Vagrant to decrease flakiness
 2020-08-15 07:08:27 -04:00
Akihiro Suda
d469bffcdc
CI: disable crun on Vagrant to decrease flakiness 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-15 14:38:46 +09:00
Maksym Pavlenko
1267b19de4
Merge pull request #4476 from thaJeztah/systemd_license_header 
systemd: add license header to systemd unit
 2020-08-14 15:08:29 -07:00
Sebastiaan van Stijn
77a33e3db6
systemd: add license header to systemd unit 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-13 13:22:50 +02:00
Sebastiaan van Stijn
c691c36614
systemd: use LimitNOFILE=infinity instead of hard-coded max value 
According to the systemd documentation, `infinity` can be used for all limits;
https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Process%20Properties

> Resource limits may be specified in two formats: either as single value to set a
> specific soft and hard limit to the same value, or as colon-separated pair soft:hard
> (...) Use the string infinity to configure no limit on a specific resource.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-13 13:06:41 +02:00
Wei Fu
433662502f
Merge pull request #4456 from crisesw/ctr-cpu-limit 
Add --cpu-quota, --cpu-period flag to ctr
 2020-08-12 20:14:13 +08:00
Wei Fu
73b1449278 runtime: ignore ErrNotExist when remove rootfs 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-08-12 20:04:50 +08:00
Wei Fu
e87c38ae05
Merge pull request #4471 from AkihiroSuda/vagrant-increase-mem 
Vagrantfile: increase memory
 2020-08-12 19:51:51 +08:00
Akihiro Suda
43cbdf89e9
BUILDING.md: fix description about static builds 
* `-linkmode external` is required since Go 1.15 for static builds: https://github.com/golang/go/issues/40711
* Clarify the meaning of "loading plugins"

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-12 18:39:48 +09:00
Akihiro Suda
8d39722fec
Vagrantfile: increase memory 
This may deflake CIs

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-12 17:17:00 +09:00
Derek McGowan
e9f94064b9
Merge pull request #4469 from dmcgowan/update-1.4.0-rc.1 
Update version for 1.4.0-rc.1
 2020-08-11 16:08:09 -07:00
Phil Estes
790c131cf4
Merge pull request #4465 from dmcgowan/github-release-cri 
GitHub actions release of CRI tarball
 2020-08-11 17:47:04 -04:00
Derek McGowan
41469ed72b
Update version for 1.4.0-rc.1 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 14:41:22 -07:00
Prashant Bhutani
35b63c064f Report correct stats for windows containers 
Windows container stats were reporting incorrect metrics for cpu kernel runtime.

Signed-off-by: Prashant Bhutani <prbhutan@microsoft.com>
 2020-08-12 00:51:37 +05:30
Akihiro Suda
f0c50967fb
Merge pull request #4466 from thaJeztah/bump_cri2 
vendor: containerd/cri 4e6644c8cf and dependencies
 2020-08-12 01:27:16 +09:00
Derek McGowan
60fa35f11e
Fix DCO commit limit 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 09:16:41 -07:00
Derek McGowan
d2472ecc59
Add CRI release build 
Add installation scripts needed to generate CRI + CNI tar package on
release.
Update Github action release script to generate CRI release tarballs for
Linux and Windows.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 09:16:38 -07:00
Derek McGowan
1c7312e5da
Update containerd systemd unit file 
Synchronizes unit file with CRI's version

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-08-11 09:15:12 -07:00
Lantao Liu
ccda537604
Create etcd user in cloud init. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Mike Brown
e973719ccf
use containerd/project header test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
cb7ffd4b0b
Fix indent in cni.template. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
3e03ba7aa2
Update deployment and integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
9c54517920
Add TaskMax=infinity 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
523b0b3c61
Remove noSnat 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
231d291b2d
Use v2 config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
1e1688d211
Use per-pod shim. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:11 -07:00
Lantao Liu
87bd84a7bb
Add DefaultRuntimeName option. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
cfab98a5fd
Use ctr images import. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00
Lantao Liu
5e3ac16cc6
Add cri as required plugin. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2020-08-11 09:15:10 -07:00