Commit Graph

1444 Commits

Author SHA1 Message Date
Lantao Liu
532a895d7d Update critest.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 03:10:57 +00:00
Lantao Liu
46fc92f65f Use new namespace mode and support shared pid namespace.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 03:10:57 +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
ae85d0ee81 Update kubernetes to 0caa20c65f147e15f5545862510eb7e81c42b0a3.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-08 02:45:44 +00:00
Lantao Liu
047df7aca6
Merge pull request #602 from mikebrow/critools-install-minor-update
update critools
2018-02-07 18:44:37 -08:00
Mike Brown
edb2b2379d change crictl sandboxes to pods; other references to sandboxes
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-07 17:23:59 -06:00
Lantao Liu
2acd6c1a5c
Merge pull request #599 from Random-Liu/update-ocicni
Update ocicni to main stream.
2018-02-07 13:47:12 -08:00
Lantao Liu
f36a8bf2ba
Merge pull request #598 from Random-Liu/use-containerd-log-trace
Use containerd log trace
2018-02-07 13:47:01 -08:00
Mike Brown
f19cd8ad67 update critools
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-07 13:47:23 -06:00
Lantao Liu
caf2bdb04a Update ocicni to main stream.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:39:06 +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
b776e696bd Update containerd
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-07 19:17:26 +00:00
Lantao Liu
2fa185c09f
Merge pull request #596 from Random-Liu/remove-wrong-comment
Remove wrong comment. CRI is actually a grpc plugin of containerd now.
2018-02-06 13:32:43 -08:00
Lantao Liu
447c2284cf Remove wrong comment. CRI is actually a grpc plugin of containerd now.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-06 00:45:32 +00:00
Lantao Liu
78f3df285f
Merge pull request #595 from Random-Liu/no-critest-in-release
Remove critest from release tarball.
2018-02-05 15:39:12 -08:00
Lantao Liu
5740e94338 Remove critest from release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-05 22:21:10 +00:00
Lantao Liu
f4625ef76c
Merge pull request #593 from Random-Liu/fix-ocicni-commit
I rebased my ocicni fork, and ruin the previous commit...
2018-02-04 12:14:26 -08:00
Lantao Liu
9f49134cc0 I rebased my fork, and ruin the previous commit...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-03 00:58:54 +00:00
Lantao Liu
2b8800df2b
Merge pull request #592 from Random-Liu/fix-registry-mirror
Fix registry mirror.
2018-02-02 15:37:29 -08:00
Lantao Liu
92995e29e5 Fix registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 22:52:36 +00:00
Lantao Liu
b7c17ae06a
Merge pull request #585 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-02 13:18:51 -08:00
Mike Brown
bec05e31df
Merge pull request #591 from Random-Liu/update-ocicni
Update ocicni to my fork.
2018-02-02 14:30:17 -06:00
Stephen J Day
680bafea76
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-02 11:53:48 -08:00
Lantao Liu
d113c16802 Update ocicni to my fork.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 19:45:26 +00:00
Lantao Liu
34dd28ab32
Merge pull request #586 from Random-Liu/add-ctrcri
Add a separate CLI for cri-containerd `ctrcri`.
2018-02-02 10:43:15 -08:00
Lantao Liu
2d61bdbb0a
Merge pull request #588 from Random-Liu/fix-registry-mirror
Use registry-1.docker.io as backup
2018-02-02 01:21:40 -08:00
Lantao Liu
3d94077144 Use registry-1.docker.io as backup
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 07:52:05 +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
Lantao Liu
59816f840f
Merge pull request #583 from Random-Liu/version-in-metadata
Put version into metadata so that version won't be changed across reboot.
2018-02-01 16:09:45 -08:00
Lantao Liu
05a4743d5f
Merge pull request #582 from Random-Liu/use-registry-mirror
Set registry mirror.
2018-02-01 15:23:45 -08:00
Lantao Liu
fb8d1edb5c Put version into metadata so that version won't be changed across
restart.

Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 23:14:10 +00:00
Lantao Liu
c298d913b7
Merge pull request #584 from Random-Liu/add-golang-version
Add golang version in `Status` info.
2018-02-01 14:55:59 -08:00
Lantao Liu
7ddd9255b6 Add golang version in Status info.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 20:10:39 +00:00
Lantao Liu
4165c2b8c1
Merge pull request #581 from Random-Liu/update-containerd
Update containerd to fix mount.Lookup.
2018-02-01 11:10:06 -08:00
Lantao Liu
ead704ddd3 Set registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:49:09 +00:00
Lantao Liu
a28672b088 Update containerd to fix mount.Lookup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:27:15 +00:00
Abhinandan Prativadi
8094fe69d4
Merge pull request #531 from abhi/registry-mirror
Adding Registry Mirror support
2018-01-31 13:01:25 -08: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
Mike Brown
175278a3e3
Merge pull request #579 from Random-Liu/kube-up-runtime-cgroups
Configure container runtime cgroups for cgroup.
2018-01-30 10:11:17 -06:00
Lantao Liu
6261a4a4ca
Merge pull request #484 from yanxuean/event-filter
add filter for containerd event
2018-01-30 00:27:43 -08:00
yason
6931a69881 add filter for containerd event
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
2018-01-30 14:13:22 +08:00
Lantao Liu
15bba777aa Configure container runtime cgroups for cgroup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-30 02:56:03 +00:00
Lantao Liu
765c2c9341
Merge pull request #578 from Random-Liu/update-containerd
Update containerd to ec15fe95aa.
2018-01-29 13:39:22 -08:00
Lantao Liu
23e872a44d Update containerd to ec15fe95aa.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-29 18:44:16 +00:00
Lantao Liu
8d2d125d82
Merge pull request #577 from Random-Liu/fix-privileged-check
Fix a privileged check.
2018-01-27 20:24:09 -08:00
Lantao Liu
4dfd8250fd Fix a privileged check.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-27 02:25:52 +00:00
Lantao Liu
9f6315bc88
Merge pull request #576 from Random-Liu/add-benchmark-image-config
Add image config for benchmark.
2018-01-26 14:33:10 -08:00
Lantao Liu
5ed3262450 Add image config for benchmark.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-26 20:04:49 +00:00
Lantao Liu
08644a7fff
Merge pull request #575 from miaoyq/use-channel-propagate-stop-info-of-sandbox
Use channel to propagate the stop info of sandbox
2018-01-26 01:58:32 -08:00
Yanqiang Miao
61c1fdb098 Use channel to propagate the stop info of sandbox
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-26 16:58:13 +08:00