Commit Graph

71 Commits

Author SHA1 Message Date
Lantao Liu
e1fe1abff0 Use github.com/pkg/errors
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-17 02:24:38 +00:00
abhi
003bbd4292 Modifying fake cni plugin
Signed-off-by: abhi <abhi@docker.com>
2018-03-15 17:05:33 -07:00
abhi
92110e1d74 Moving to use go-cni library from containerd
This fix aims to use the cni library form containerd.
The library avoid usage of nsenter.

Signed-off-by: abhi <abhi@docker.com>
2018-03-14 19:25:54 -07:00
Mike Brown
d4e7154625 move links for cri-containerd to cri
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-13 17:06:26 -05:00
Lantao Liu
f0a500a390 Use direct function call.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-13 04:51:19 +00:00
Lantao Liu
d1e9960180 Remove standalone mode
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:45:20 +00:00
Lantao Liu
6d538ccbf6 Do not block on stream server close.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-14 08:41:29 +00:00
Lantao Liu
6900cbdada Use mountpoint as image fs identifier.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-09 07:46:49 +00:00
Lantao Liu
605b4a7b6a Update imports
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 02:45:44 +00:00
Lantao Liu
e7f2a74a84 Add runtime cgroup and fix a cli panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 22:32:57 +00:00
Lantao Liu
635e5747c0 Update containerd and leverage plugin graceful stop.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 22:46:46 +00:00
Lantao Liu
4e9ca399e1 Use containerd plugin config.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-19 02:25:03 +00:00
Lantao Liu
7d18d61674 Move cgroup and oom score setting to cmd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-19 01:35:36 +00:00
Lantao Liu
62e6921145 Use containerd grpc server
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 18:51:18 +00:00
Lantao Liu
3d68005c04 Replace glog with logrus
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +00:00
Lantao Liu
025ffe551f Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-10 22:35:33 +00:00
Lantao Liu
dca05358dc Add flag to skip imagefs uuid related logic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-08 18:41:13 +00:00
yason
4762b3e273 remove taskService and imageStoreService
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-12 16:51:22 +08:00
yason
41c8763e2b improve calling for content
Signed-off-by: yason <yan.xuean@zte.com.cn>
2017-12-11 15:28:10 +08:00
Lantao Liu
25fdf72692 Add image load.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 21:51:04 +00: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
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
517f697f62 Better format several errors
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 01:15:06 +00:00
Mike Brown
d8a3c6b018 adds support for configuring the containerd runtime engine
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-26 20:22:51 -05:00
Lantao Liu
4231473df3 Address comments
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 23:09:44 +00:00
Lantao Liu
491400c892 Add ImageFsInfo support
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 21:02:29 +00:00
Lantao Liu
cc1b0b6709 Add restart recovery logic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 17:59:46 +00:00
Lantao Liu
71b0d0a043 Use config in service.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-17 06:46:40 +00:00
Lantao Liu
b074388460 Update containerd to v1.0.0-beta.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-09 04:46:02 +00:00
Lantao Liu
7a75a91578 Merge pull request #225 from Random-Liu/update-ocicni
Update ocicni to 73f1309d6bc5c3eac78c1382408921cd771ff22e
2017-09-06 21:04:45 -07:00
Lantao Liu
f36ef46b35 Use new ocicni.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-07 00:14:12 +00:00
Lantao Liu
2b6302d91d Remove an addressed TODO.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-06 23:29:27 +00:00
Jamie Zhuang
915f5b0aea Make sandbox container image configurable
Signed-off-by: Jamie Zhuang <lanchongyizu@gmail.com>
2017-09-03 02:53:17 -04:00
Lantao Liu
c3e8c69aff Let cri-containerd exit with containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-01 23:14:04 +00:00
Abhinandan Prativadi
e1edeae4c9 Adding option to configure cgroup to start cri-containerd
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-30 14:37:40 -07:00
Lantao Liu
c4d95aa2c4 Fix sandbox container snapshotter.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-30 18:33:59 +00:00
Lantao Liu
73bb9696e8 Merge pull request #151 from Random-Liu/add-instrumented-service
Add instrumented service.
2017-08-24 11:26:39 -07:00
Lantao Liu
45ee2e554a Add container attach support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 23:48:31 +00:00
Lantao Liu
195b52500f Add instrumented service.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 07:02:12 +00:00
Lantao Liu
f6d99abcf4 Add hostport support
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-23 01:33:02 +00:00
Lantao Liu
dcc3cb2a05 Merge pull request #137 from Random-Liu/cleanup-with-new-client
Some cleanup after switching to new client.
2017-08-18 15:04:24 -07:00
Lantao Liu
ed640d3972 Some cleanup after switching to new client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-18 21:04:38 +00:00
yanxuean
8cc0347b0a The parameters of InitCNI should be filled in reverse order.
fix  #131

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-08-17 10:18:40 +08:00
Lantao Liu
54286313ce Add container Exec support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-07 22:49:06 +00:00
Mike Brown
73748840da Swicth to 1.0.0-alpha2 containerd api.
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-08-02 23:21:37 +00:00
Lantao Liu
7b16a35287 Use new metadata store.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-07-28 23:35:31 +00:00
Lantao Liu
4317e6119a Remove sandbox truncindex.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-07-28 23:35:31 +00:00
Lantao Liu
78b74a6a58 Merge pull request #85 from Random-Liu/update-cri
Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd.
2017-06-21 13:18:24 -07:00
Lantao Liu
862d00a21c Update CRI to d779e9c9561b732adf06263c5424889e7564fdbd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-21 01:56:13 +00:00
Mike Brown
97063a0e34 switch to client provided services and address nits
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-06-20 19:19:14 -05:00