github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
1,444 Commits 3 Branches 2 Tags 112 MiB
effd82227c
Commit Graph

1444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
bfd25c80b4 Change StateUnknown to StateInit 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-02-04 11:24:49 -08:00
Lantao Liu
dd2846d941
Merge pull request #1035 from Random-Liu/add-runtime-option 
Add RUNTIME env in integration and cri test.
 2019-01-29 18:50:02 -08:00
Lantao Liu
0bd90a77ef Add RUNTIME env in integration and cri test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-28 11:06:20 -08:00
Mike Brown
90492e9e70
Merge pull request #1034 from fuweid/cleanup 
hack: handle additional cleanup from #1028
 2019-01-25 20:13:26 -06:00
Wei Fu
c019ae8b21 hack: handle additional cleanup from #1028 
remove the `unset` in the script.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-01-26 09:38:16 +08:00
Lantao Liu
538a361b3a
Merge pull request #1028 from fuweid/detect-dirty-vendor 
hack/Makefile: detect dirty vendor
 2019-01-25 10:33:41 -08:00
Wei Fu
119222016f hack/Makefile: detect dirty vendor 
use containerd/project script to detect dirty vendor.

close: #1012

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-01-25 10:10:43 +08:00
Lantao Liu
4dd6735020
Merge pull request #1029 from Random-Liu/add-runtime-config-api 
Add a generic runtime options api.
 2019-01-24 17:36:20 -08:00
Lantao Liu
5d1a07e86c
Merge pull request #1032 from Random-Liu/small-code-cleanup 
Don't use string when there is a constant.
 2019-01-24 12:58:16 -08:00
Lantao Liu
9a455daf4d Don't use string when there is a constant. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 11:45:16 -08:00
Lantao Liu
bf00de33a5
Merge pull request #1025 from JoeWrightss/patch-4 
Fix some typos in comment
 2019-01-24 11:17:33 -08:00
Lantao Liu
97c7a1b17b
Merge pull request #1027 from Random-Liu/fix-log-ending-newline 
Fix the log ending newline handling.
 2019-01-24 10:22:03 -08:00
Lantao Liu
d9914c8dbd Always fallback to the new runtime options. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 00:59:02 -08:00
Lantao Liu
42aba00a31 Add runtime config api. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-24 00:59:02 -08:00
Lantao Liu
556b219450 Fix lint error. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 18:14:34 -08:00
Lantao Liu
879dc6ae25 Add integration test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 18:14:34 -08:00
Lantao Liu
50ac40097e Fix the log ending newline handling. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-23 17:23:13 -08:00
zhoulin xie
ae1b7ac4fd Fix some typos in comment 
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
 2019-01-17 15:50:46 +08:00
Mike Brown
8976690320
Merge pull request #1021 from Random-Liu/move-no-metadata-test 
Move no metadata test
 2019-01-09 11:25:40 -06:00
Lantao Liu
5c40fd9585 Move no metadata test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-09 00:12:53 -08:00
Lantao Liu
76c5b20339
Merge pull request #1019 from teawater/add_test 
Add integration test for RunPodSandbox and CreateContainer
 2019-01-08 11:12:53 -08:00
Hui Zhu
ab84e3914d Add integration test for RunPodSandbox and CreateContainer 
Fixes: #1009

Signed-off-by: Hui Zhu <teawater@hyper.sh>
 2019-01-08 12:05:48 +08:00
Lantao Liu
a7d1b3c7dc
Merge pull request #1020 from Random-Liu/add-test-for-shared-pid-multi-process-container-stop 
Add test for shared pid multi-process container stop.
 2019-01-05 16:50:36 -08:00
Lantao Liu
f0f68c1032 Add test for shared pid multi-process container stop. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-04 13:16:29 -08:00
Lantao Liu
a22f1c3416
Merge pull request #1017 from Random-Liu/add-unit-test 
Add unit test for DisableCgroup, RestrictOOMScoreAdj.
 2019-01-03 13:39:52 -08:00
Lantao Liu
b1ad4ee9b6 Add unit test for DisableCgroup, RestrictOOMScoreAdj. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-01-03 10:47:34 -08:00
Lantao Liu
0fa8668aa4
Merge pull request #970 from AkihiroSuda/rootless 
support DisableCgroup, DisableApparmor, RestrictOOMScoreAdj
 2019-01-03 10:14:22 -08:00
Lantao Liu
1fbd06479e
Merge pull request #1010 from teawater/fix_crash 
Fix the issue that pod or container config file without metadata will…
 2019-01-03 10:10:26 -08:00
Hui Zhu
3bfef01589 Fix the issue that pod or container config file without metadata will crash containerd 
Because RunPodSandbox and CreateContainer will access metadata
without check, pod or container config file without metadata will
crash containerd.

This patch add checks to handle the issue.

Fixes: #1009

Signed-off-by: Hui Zhu <teawater@hyper.sh>
 2019-01-03 11:02:10 +08:00
Akihiro Suda
cd8231ab2a support DisableCgroup, DisableApparmor, RestrictOOMScoreAdj 
Add following config for supporting "rootless" mode

* DisableCgroup: disable cgroup
* DisableApparmor: disable Apparmor
* RestrictOOMScoreAdj: restrict the lower bound of OOMScoreAdj

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2019-01-03 05:12:04 +09:00
Lantao Liu
4b4b2abb2e
Merge pull request #1000 from Random-Liu/teardown-network-after-stop 
Teardown sandbox network after stop.
 2019-01-02 10:04:56 -08:00
Mike Brown
888f7a03a3
Merge pull request #1013 from JoeWrightss/patch-3 
Fix return error message
 2018-12-30 15:57:22 -06:00
JoeWrightss
55fb3b9fce Fix return error message 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-30 18:08:04 +08:00
Lantao Liu
e5bd9b62d8
Merge pull request #1003 from Random-Liu/revert-#997 
Revert "Temporary fix for golang regression #29241."
 2018-12-19 13:08:29 -08:00
Lantao Liu
a9f3c86cc1
Merge pull request #1004 from Random-Liu/fix-build 
Install libseccomp2 based on debian version
 2018-12-19 12:02:43 -08:00
Lantao Liu
26640a29eb Install libseccomp2 package based on debian version. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-19 11:39:26 -08:00
Lantao Liu
5d5fc154ad Revert "Temporary fix for golang regression #29241." 
This reverts commit d7f6721de5.

Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-19 10:45:01 -08:00
Lantao Liu
e98e307f3f
Merge pull request #1001 from Random-Liu/update-kubernetes 
Update kubernetes to v1.13.0
 2018-12-17 17:27:44 -08:00
Lantao Liu
ac45393a47 Update cri-tools to v1.13.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-17 11:54:32 -08:00
Lantao Liu
2baa96e0e2 Update kubernetes to v1.13.0 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-17 11:54:21 -08:00
Lantao Liu
fbab182e5e Teardown sandbox network after stop. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-14 15:52:17 -08:00
Lantao Liu
afb12d728c
Merge pull request #997 from Random-Liu/fix-for-golang-issue 
Temporary fix for golang regression #29241.
 2018-12-14 14:14:50 -08:00
Lantao Liu
d7f6721de5 Temporary fix for golang regression #29241. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-14 13:49:16 -08:00
Mike Brown
cd3d5c7992
Merge pull request #993 from JoeWrightss/patch-2 
Fix some typo errors
 2018-12-11 07:49:27 -08:00
JoeWrightss
d53bcba991 Fix some typo errors 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-11 22:13:03 +08:00
Lantao Liu
ec6a1eab11
Merge pull request #991 from Random-Liu/remove-container-lifecycle-image-dependency 
Remove container lifecycle image dependency
 2018-12-07 17:03:57 -08:00
Lantao Liu
82d8c9bcfa Add integration test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-07 10:40:21 -08:00
Lantao Liu
515ef02473 Remove container lifecycle image ref dependency. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-12-07 10:40:21 -08:00
Mike Brown
be2c3bd94b
Merge pull request #992 from JoeWrightss/patch-1 
fix spelling error: contaner -> container
 2018-12-08 01:15:15 +08:00
JoeWrightss
37085692e2 fix spelling error: contaner -> container 
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
 2018-12-07 22:56:09 +08:00