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 |
|
Lantao Liu
|
bde8b0517e
|
Update kubernetes and containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-11 06:16:19 +00:00 |
|
Lantao Liu
|
5531a71873
|
Add prow node e2e test.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-10 23:29:44 +00:00 |
|
Lantao Liu
|
d50c610947
|
Merge pull request #335 from Random-Liu/fix-fs-uuid
Use device number to find uuid
|
2017-10-10 16:06:18 -07:00 |
|
Lantao Liu
|
232f1e4cdc
|
Merge pull request #340 from Random-Liu/disable-maligned
Disable maligned check.
|
2017-10-10 16:06:05 -07:00 |
|
Lantao Liu
|
aab0c5df77
|
Disable maligned check.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-10 22:38:00 +00:00 |
|
Lantao Liu
|
679868c667
|
Merge pull request #336 from Random-Liu/add-node-e2e-tar
Add staging tar for node e2e.
|
2017-10-09 13:38:47 -07:00 |
|
Lantao Liu
|
6cb3d27ed3
|
Use device number to find uuid
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-09 06:10:43 +00:00 |
|
Lantao Liu
|
9135ef2c07
|
Merge pull request #334 from Random-Liu/change-versioning
Change `Version` to return cri-containerd version instead.
|
2017-10-08 20:28:39 -07:00 |
|
Lantao Liu
|
2449ffdc42
|
Add staging tar for node e2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-07 04:45:10 +00:00 |
|
Lantao Liu
|
09d7d652e6
|
Change Version to return cri-containerd version instead.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-07 00:47:51 +00:00 |
|
Lantao Liu
|
e77795b968
|
Merge pull request #332 from Random-Liu/use-container-update
Use container update
|
2017-10-06 13:20:30 -07:00 |
|
Lantao Liu
|
e78c85f76b
|
Use new container update function
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-06 17:57:26 +00:00 |
|
Lantao Liu
|
46ed19b23c
|
Merge pull request #331 from Random-Liu/run-repodigest-node-e2e
Run repodigest test.
|
2017-10-06 10:18:37 -07:00 |
|
Lantao Liu
|
f7eaa29c67
|
Update containerd to 8558b98eb1
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-06 01:40:39 +00:00 |
|
Lantao Liu
|
3ff61f9010
|
Run repodigest test.
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-05 23:55:55 +00:00 |
|
Lantao Liu
|
d2122d62dd
|
Merge pull request #324 from Random-Liu/installation
Add guide for installation from release tarball
|
2017-10-05 13:43:59 -07:00 |
|
Lantao Liu
|
1e00322107
|
Add guide for installation from release tarball
Signed-off-by: Lantao Liu <lantaol@google.com>
|
2017-10-05 18:44:23 +00:00 |
|
Lantao Liu
|
eb2ea51e00
|
Merge pull request #329 from Random-Liu/update-kubernetes-hack-versions
Update `hack/versions`
|
2017-10-05 09:47:47 -07:00 |
|