Commit Graph

74 Commits

Author SHA1 Message Date
Evan Hazlett
d7d2212324 vendor bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

containerd: linux -> runtime/linux

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

fix utils to properly format vendor repo

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

test fixup

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 19:51:24 -04:00
Lantao Liu
aa83a7a0aa Change for new containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 23:03:16 +00:00
Lantao Liu
7e67d96b9b Replace ctrcri with ctr cri.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-15 23:22:00 +00: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
ef5b9d1e16 Only overwrite when legacy options are specified.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-03 01:03:34 +00:00
Lantao Liu
cc2726054d Add test-containerd for plugin mode test
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-21 22:21:48 +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
8925ef90be Use trace support in containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:17:26 +00:00
Lantao Liu
1f1e03e001 Add a separate CLI for cri-containerd ctrcri.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 02:54:05 +00:00
abhi
f3ccd85891 Adding Registry Mirror support
This commit aims to add registy mirror support similar to
docker. The UI is similar to docker where user can
provide mirror urls and the image resolves against the provided
mirrors before fetching from default docker regitry mirror url.

Signed-off-by: abhi <abhi@docker.com>
2018-01-31 10:47:34 -08: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
2b6f084f36 Disable IPv6 dad by default.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-22 23:54:16 +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
383a89b948 Add flags and utils for logrus
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +00:00
Lantao Liu
bd9e9ce56e Add containerd plugin mode.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-15 06:54:55 +00:00
Lantao Liu
54b3b4e0b0 Use graphdriver/copy instead of chrootarchive
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-11 19:10:11 +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
Lantao Liu
5bbf83bc5d Cleanup config.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-07 21:02:58 +00: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
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
Lantao Liu
a77ba6b84b Cleanup image load code.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-02 23:09:43 +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
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
439ee0a973 Add stack dump.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-27 22:45:38 +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
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
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
f586073b1c Merge pull request #294 from Random-Liu/cleanup-flags
Cleanup flag default value
2017-09-28 13:13:14 -07:00
Lantao Liu
dc947114bb Cleanup flag default value
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 18:24:40 +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
cd57d063c5 Add systemd cgroup support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-26 06:44:30 +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
dd967cde8c Improve apparmor and selinux support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 20:46:31 +00:00
Lantao Liu
90d6e44c22 Merge pull request #267 from Random-Liu/fix-apparmor
Fix apparmor empty case.
2017-09-20 21:53:28 -07:00
Lantao Liu
dd3421c3c7 Fix apparmor empty case.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-21 04:07:39 +00:00
Ian Campbell
8c6ba35038 Implement volume copy up.
This pulls in and uses github.com/docker/docker/pkg/chrootarchive for the
actual copy up which is some battle hardened code to unpack avoiding things
like symlink traversal security issues.

However it does pull in a pretty huge pile of vendoring, including
github.com/docker/docker/pkg/reexec which we must then call at startup. It's
not immediately clear that this tradeoff is the correct one.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 09:52:27 +01:00
Lantao Liu
a8d4940285 Merge pull request #227 from yanxuean/tomldefault
Add a default config file
2017-09-17 22:38:40 -07:00
Lantao Liu
06a305d7ea Merge pull request #255 from Random-Liu/use-config-in-service
Use config in service.
2017-09-17 22:37:06 -07:00
yanxuean
c24a5db242 Add a default config file
fix #226

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2017-09-18 08:57:10 +08: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
3f305e2cf4 Format the code a bit.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-17 03:22:21 +00:00