Lantao Liu
|
c44f798145
|
Merge pull request #371 from Random-Liu/fix-removing
Fix removing state recover.
|
2017-10-31 22:29:53 +01:00 |
|
Lantao Liu
|
4eaaee380f
|
Fix removing state recover.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-31 20:03:58 +00:00 |
|
Lantao Liu
|
95067d76a7
|
Merge pull request #374 from Random-Liu/add-runtime-cgroup
Add runtime cgroup and put containerd and cri-containerd into it.
|
2017-10-31 20:59:13 +01:00 |
|
Lantao Liu
|
95dfd3c039
|
Add runtime cgroup and put containerd and cri-containerd into it.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-31 06:21:20 +00:00 |
|
Lantao Liu
|
b27a4c1723
|
Merge pull request #373 from Random-Liu/update-cri-tools
Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21.
|
2017-10-30 16:57:27 +01:00 |
|
Lantao Liu
|
dcb22bebae
|
Merge pull request #372 from Random-Liu/add-container-log-path
Add the missing container log path in container status.
|
2017-10-30 16:57:10 +01:00 |
|
Lantao Liu
|
5d46a90b7f
|
Update cri-tools version to 8e989f8b7a716534896ee082b7b1fb47bd66df21.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-30 06:39:19 +00:00 |
|
Lantao Liu
|
4e6e1cab0d
|
Add the missing container log path in container status.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-30 06:03:52 +00:00 |
|
Lantao Liu
|
1d14c11dcb
|
Merge pull request #368 from Random-Liu/not-log-output
Do not log container output in error log.
|
2017-10-28 05:50:14 +02:00 |
|
Lantao Liu
|
f2fa351a1f
|
Do not log container output in error log.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-28 02:16:43 +00:00 |
|
Lantao Liu
|
c3b03f8fec
|
Merge pull request #366 from Random-Liu/add-dump-stack
Add stack dump.
|
2017-10-28 02:15:17 +02:00 |
|
Lantao Liu
|
439ee0a973
|
Add stack dump.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 22:45:38 +00:00 |
|
Lantao Liu
|
6cded68bac
|
Merge pull request #360 from Random-Liu/add-image-load
Add image load
|
2017-10-28 00:43:20 +02:00 |
|
Lantao Liu
|
7f11eff42d
|
Add integration test for image load
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 21:51:04 +00:00 |
|
Lantao Liu
|
25fdf72692
|
Add image load.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 21:51:04 +00:00 |
|
Lantao Liu
|
64c719622a
|
Merge pull request #365 from Random-Liu/random-fix
Fix a log line and also set containerd log level to debug in node e2e.
|
2017-10-27 19:44:15 +02:00 |
|
Lantao Liu
|
32806fa375
|
Fix a log line and also set containerd log level to debug in node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 07:21:37 +00:00 |
|
Lantao Liu
|
c6fd18ddc3
|
Update cobra and pflag
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 06:42:18 +00:00 |
|
Lantao Liu
|
1d5cd86207
|
Merge pull request #364 from Random-Liu/revert-#338
Revert "Put containerd-shim into pod cgroup"
|
2017-10-27 08:13:44 +02:00 |
|
Lantao Liu
|
f10cc58362
|
Revert "Put containerd-shim into pod cgroup"
This reverts commit e9cf1d5909.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 05:33:55 +00:00 |
|
Lantao Liu
|
486d7628c0
|
Merge pull request #363 from Random-Liu/fix-node-e2e
Add `--ipv4` in `curl`.
|
2017-10-27 06:19:06 +02:00 |
|
Lantao Liu
|
22adf92f66
|
Add --ipv4 in curl.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 02:57:34 +00:00 |
|
Lantao Liu
|
4b40fe74b9
|
Merge pull request #362 from Random-Liu/add-log
Add log of generated id for debugging.
|
2017-10-27 04:47:25 +02:00 |
|
Lantao Liu
|
5e74cba0f0
|
Add log of generated id for debugging.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-27 00:11:16 +00:00 |
|
Lantao Liu
|
6c6b337e87
|
Merge pull request #358 from Random-Liu/unpack-when-creation
Also unpack image during creation.
|
2017-10-26 22:44:07 +02:00 |
|
Lantao Liu
|
acc3f74d5c
|
Also unpack image during creation.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-26 17:57:53 +00:00 |
|
Lantao Liu
|
4d713ece79
|
Merge pull request #338 from miaoyq/debug-add-shim-to-cgroup
Put containerd-shim into pod cgroup
|
2017-10-26 05:06:09 +02:00 |
|
Yanqiang Miao
|
e9cf1d5909
|
Put containerd-shim into pod cgroup
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
|
2017-10-26 10:17:12 +08:00 |
|
Lantao Liu
|
8fb63c5664
|
Merge pull request #356 from Random-Liu/change-to-cli
Change to cli
|
2017-10-25 05:48:52 +02:00 |
|
Lantao Liu
|
16f1c54bd6
|
Add version subcommand.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-25 00:19:37 +00:00 |
|
Lantao Liu
|
eb4d5f3fc7
|
Add default-config command.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-25 00:19:37 +00:00 |
|
Lantao Liu
|
7977970e04
|
Use cobra for cli.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-25 00:19:37 +00:00 |
|
Lantao Liu
|
a7c48f2f3f
|
Merge pull request #355 from w9n/master
bump containerd version
|
2017-10-25 00:58:10 +02:00 |
|
w9n
|
1a6be2b573
|
update containerd, runc, cgroups, sys and docker version
Signed-off-by: w9n <w9ncontact@gmail.com>
|
2017-10-24 22:52:29 +02:00 |
|
Lantao Liu
|
698f0ea2ae
|
Merge pull request #345 from yanxuean/imagereadiness
check image readiness when recover
|
2017-10-23 16:09:14 +02:00 |
|
yanxuean
|
9d06ac0e2b
|
check image readiness when recover
fix #303
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
|
2017-10-23 19:21:39 +08:00 |
|
Lantao Liu
|
70023a3c37
|
Merge pull request #350 from ijc/subtract
typo: subtract not substract.
|
2017-10-13 10:40:38 -07:00 |
|
Ian Campbell
|
d75e0882c4
|
typo: subtract not substract.
Signed-off-by: Ian Campbell <ijc@docker.com>
|
2017-10-13 09:50:17 +01:00 |
|
Lantao Liu
|
4b8f87214d
|
Merge pull request #348 from Random-Liu/remove-oomscore-in-systemd
Remove the oom score in systemd unit. cri-containerd sets it by itself.
|
2017-10-12 20:45:00 -07:00 |
|
Lantao Liu
|
49c3876b8b
|
Merge pull request #349 from Random-Liu/fix-node-e2e
Fix node e2e test.
|
2017-10-12 18:30:56 -07:00 |
|
Lantao Liu
|
313db21033
|
Fix node e2e test.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-12 18:03:09 +00:00 |
|
Lantao Liu
|
a7d12a1dd8
|
Remove the oom score in systemd unit. cri-containerd sets it by itself.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-12 17:32:20 +00:00 |
|
Lantao Liu
|
e71db95d0e
|
Merge pull request #347 from yanxuean/oomscore
Add a flag to set OOMScore
|
2017-10-12 10:27:01 -07:00 |
|
yanxuean
|
3887b0a1a0
|
Add a flag to set OOMScore
fix #337
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
|
2017-10-12 16:43:35 +08:00 |
|
Lantao Liu
|
885024f987
|
Merge pull request #295 from miaoyq/use-mount-lookup
Get the mountInfo by 'LookupMount' in containerd
|
2017-10-11 21:05:39 -07:00 |
|
Lantao Liu
|
61d598d00f
|
Merge pull request #235 from yanxuean/truncindex
Add Truncindex for container, sandbox and image
|
2017-10-11 21:03:16 -07:00 |
|
Yanqiang Miao
|
c65921b16a
|
Get the mountInfo by 'LookupMount' in containerd
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
|
2017-10-12 11:09:24 +08:00 |
|
yanxuean
|
5ee3423820
|
add truncindex
fix #222
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
|
2017-10-12 10:32:20 +08:00 |
|
Lantao Liu
|
a34bc19f62
|
Merge pull request #339 from Random-Liu/add-node-e2e-prow
Add prow node e2e test.
|
2017-10-11 10:36:55 -07:00 |
|
Lantao Liu
|
e4b818ff41
|
Merge pull request #342 from Random-Liu/update-kubernetes-containerd
Update kubernetes and containerd.
|
2017-10-11 00:23:24 -07:00 |
|