Commit Graph

8341 Commits

Author SHA1 Message Date
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
Lantao Liu
5b9d8476ea Use runc.v1 for now for debugging.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:10 -07:00
Lantao Liu
e6e272e740 Enable runc.v2 as the default runtime in test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:10 -07:00
Lantao Liu
d19aa0fd2e Use local env to avoid writing to passed-in readonly env.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:10 -07:00
Lantao Liu
ee6d69bbc1 Set default "" to extra runtime handler.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:10 -07:00
Tim Allclair
474c79bd52 Expose vars to configure an additional runtime handler
Expose environment variables in the GCE containerd configuration
script for configuring an additional runtime handler. This unblocks
E2E testing of custom runtime handlers.

Signed-off-by: Tim Allclair <tallclair@google.com>
2020-08-11 09:15:10 -07:00
Lantao Liu
ce12477f47 Support docker 18.09 in the test script.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:10 -07:00
Lantao Liu
1467121010 Remove the unused health-monitor.sh.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
201ad4d3c4 Support netd in GCE bootstrap.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
5ce7057502 Serve streaming on localhost by default to match k8s 1.11 default.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
b553fdaf31 Remove crictl on GCE for all cases.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
d8ce08fd92 Set stream server to serve on localhost on GCE.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
1629bab7f9 Make max container log line size configurable through cloud init.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
042378dcf1 Disable TLS streaming to work with new kubelet streaming proxy.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:09 -07:00
Bingshen Wang
37f2ecad97 Update cni.template
Format the cni.template, use `space` instead of some `tab`. Avoid indent issue in text editor.

Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2020-08-11 09:15:09 -07:00
Lantao Liu
b58b6fef86 Disable restart plugin on GCE.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:08 -07:00