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

1620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lantao Liu
5bbf83bc5d Cleanup config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-07 21:02:58 +00:00
Lantao Liu
affc6e93a8
Merge pull request #397 from yanxuean/trunc-for-list 
Add truncindex for filter in List and Stat
 2017-11-07 00:41:03 -08:00
yanxuean
12bbbc0edc add unit test for listcontainer and listpodsandbox 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-07 15:57:29 +08:00
Lantao Liu
6ee3db4825
Merge pull request #402 from Random-Liu/fix-attach-tty 
Reverse the wrong logic for tty.
 2017-11-06 21:16:38 -08:00
Lantao Liu
75e97dd168 Reverse the wrong logic for tty. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-07 02:03:44 +00:00
Lantao Liu
b9d4eda403
Merge pull request #401 from Random-Liu/add-comment 
Add comment for #398.
 2017-11-06 14:09:50 -08:00
Lantao Liu
68e74dc16a
Merge pull request #394 from Random-Liu/fix-container-streaming 
Various fixes for container streaming.
 2017-11-06 14:09:30 -08:00
Lantao Liu
6f97764171 Add comment for #398. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 20:54:50 +00:00
Lantao Liu
eec818e6ab Various fixes for container streaming. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 20:50:50 +00:00
Lantao Liu
e363c218d6
Merge pull request #395 from Random-Liu/fix-image-in-container-status 
Return image tag as image spec.
 2017-11-06 10:55:37 -08:00
Lantao Liu
b6a1697c75
Merge pull request #396 from weiwei04/ansible 
replace deprecated ansible include cmd
 2017-11-06 10:37:56 -08:00
Lantao Liu
7c4c80befb
Merge pull request #398 from justincormack/remove-comment-read-only 
Remove comment about whether other paths should be read only with root
 2017-11-06 10:31:49 -08:00
Justin Cormack
913836474b Remove comment about whether other paths should be read only with ro root 
Since https://github.com/moby/moby/pull/35344 we clarified that this behaviour
was a mistake, and the read only flag should just apply to the actual rootfs,
so it corresponds to the OCI read-only option. Other mounts may be able to be
adjusted by re-specifying them or other means but this is unrelated.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-11-06 14:21:16 +00:00
yanxuean
6234337459 Add truncindex for filter in List and Stat 
fix #344
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-06 16:47:43 +08:00
Wei Wei
53a4f93967 replace deprecated ansible include cmd 
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
 2017-11-06 15:06:46 +08:00
Lantao Liu
4a4a860dfa
Merge pull request #392 from Random-Liu/add-crictl-config 
Add crictl config.
 2017-11-05 22:14:21 -08:00
Lantao Liu
050ee1de95 Return image tag as image spec. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 06:05:49 +00:00
Lantao Liu
74abfe349d Add crictl config. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-06 05:28:58 +00:00
Lantao Liu
8a1a2f2713
Merge pull request #390 from miaoyq/update-hack-version 
Update 'hack/versions'
 2017-11-03 10:22:10 -07:00
Yanqiang Miao
e79bf15dee Update 'hack/versions' and some Kubernetes repo 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 15:51:14 +08:00
Lantao Liu
9f2de2cd02
Merge pull request #382 from miaoyq/return-config 
"Status" function return cri-containerd config in json format
 2017-11-02 20:41:31 -07:00
Lantao Liu
e19e043a4c
Merge pull request #386 from Random-Liu/fix-spammy-cni-log 
Get rid of spammy CNI log.
 2017-11-02 20:40:50 -07:00
Yanqiang Miao
9b71208be9 "Status" function return cri-containerd config in json format 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:23:05 +08:00
Yanqiang Miao
72446e7e25 Update k8s to #53965 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-11-03 09:14:58 +08:00
Mike Brown
3e65b00310
Merge pull request #388 from Random-Liu/cleanup-load 
Cleanup image load code a bit.
 2017-11-02 20:10:09 -05:00
Lantao Liu
73c2cb5632 Fix spammy CNI log. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-03 01:08:07 +00:00
Lantao Liu
3312c2f560
Merge pull request #387 from Random-Liu/fix-node-e2e-test 
Fix our node e2e test.
 2017-11-02 16:37:31 -07:00
Lantao Liu
a77ba6b84b Cleanup image load code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 23:09:43 +00:00
Lantao Liu
c2796dfab3
Merge pull request #384 from Random-Liu/update-containerd 
Update containerd to 564600ee79.
 2017-11-02 15:59:50 -07:00
Lantao Liu
69c16929e3 Fix our node e2e test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:50:27 +00:00
Mike Brown
df6f4a3655 adds help for load command (#383) 
* adds help for load command

Signed-off-by: Mike Brown <brownwm@us.ibm.com>

* vendor restrom/dedent

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-11-02 15:38:24 -07:00
Lantao Liu
1d61b7464b Update containerd to 564600ee79. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 22:17:38 +00:00
Lantao Liu
4fa0975f9d
Add e2e test. (#353) 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-02 15:06:44 -07:00
Zhenhao Zhang
0c1839047c add pprof endpoint (#370) 
Add pprof endpoint

Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
 2017-11-02 11:41:37 -07:00
Lantao Liu
1117430076
Merge pull request #377 from spiffxp/assignees-to-approvers 
Rename OWNERS assignees: to approvers:
 2017-11-01 23:50:48 +01:00
Lantao Liu
8679d10733
Merge pull request #380 from Random-Liu/fix-deadlock 
Do not call `Usage` inside `Walk`.
 2017-11-01 22:04:10 +01:00
Lantao Liu
2453c03daa Do not call Usage inside Walk. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-01 18:11:11 +00:00
Aaron Crickenberger
04373a934d Rename OWNERS assignees: to approvers: 
They are effectively the same, assignees is deprecated

Signed-off-by: Aaron Crickenberger <spiffxp@gmail.com>
 2017-11-01 08:49:17 -07:00
Lantao Liu
2cb1572667
Merge pull request #379 from yanxuean/unpack 
Use image.IsUnpacked
 2017-11-01 07:50:12 +01:00
Lantao Liu
e5eac0af83
Merge pull request #376 from Random-Liu/update-cri-containerd-version-in-ansible 
Update cri-containerd version to 1.0.0-alpha.1 in ansible.
 2017-11-01 06:56:38 +01:00
yanxuean
9027a02e8e Use image.IsUnpacked 
fix #361
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
 2017-11-01 13:51:25 +08:00
Lantao Liu
964aebfb51
Merge pull request #378 from Random-Liu/rename-tarball 
Rename release tarball for node e2e to cri-containerd-cni.
 2017-11-01 03:58:42 +01:00
Lantao Liu
1d228cbc38 Rename release tarball for node e2e to cri-containerd-cni. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-01 01:31:21 +00:00
Lantao Liu
10ada61fe6 Update cri-containerd version to 1.0.0-alpha.1 in ansible. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-11-01 00:06:22 +00:00
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