Commit Graph

1058 Commits

Author SHA1 Message Date
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
Lantao Liu
f401662123
Merge pull request #571 from Random-Liu/do-not-list-task
Avoid containerd access as much as possible.
2018-01-25 16:13:43 -08:00
Lantao Liu
df58d6825d Avoid containerd access as much as possible.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-25 23:36:00 +00:00
Lantao Liu
eb6e23ab49
Merge pull request #572 from Random-Liu/add-runtime-cgroup
Add runtime cgroup and fix a cli panic.
2018-01-25 15:14:47 -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
11042a4141
Merge pull request #570 from miaoyq/fixes-569
Use channel to pass the stop info instead of polling for container stop
2018-01-25 10:27:18 -08:00
Yanqiang Miao
c663d2423e Use channel to pass the stop info instead of polling for container stop
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-01-25 11:07:54 +08:00
Lantao Liu
4fcf8d91b8
Merge pull request #567 from Random-Liu/update-containerd
Update containerd and leverage plugin graceful stop.
2018-01-23 16:24:25 -08: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
31845714ef
Merge pull request #564 from Random-Liu/update-containerd
Update containerd to 4812f4be8f.
2018-01-23 14:10:21 -08:00
Lantao Liu
1c2fef9f68
Merge pull request #563 from Random-Liu/disable-dad
Disable IPv6 dad by default.
2018-01-22 17:32:54 -08:00
Lantao Liu
dd125be836 Update containerd to 4812f4be8f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 00:08:27 +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
6bb567d6a2
Merge pull request #557 from Random-Liu/use-containerd-config
Use containerd config
2018-01-21 00:50:56 -08: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
9449892561
Merge pull request #555 from Random-Liu/move-cgroup-oom-to-cmd
Move cgroup oom to cmd
2018-01-18 18:24:42 -08: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
74d8880032
Merge pull request #552 from Random-Liu/use-containerd-grpc-server
Use containerd grpc server
2018-01-18 12:36:05 -08:00
Lantao Liu
a9d846af23 Upgrade test framework to talk to containerd sock.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 18:51:18 +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
87f73a6b5d
Merge pull request #554 from Random-Liu/minor-cleanup
Minor code cleanup.
2018-01-18 10:29:21 -08:00
Lantao Liu
6fadb7f5e9 Minor code cleanup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 07:31:16 +00:00
Lantao Liu
ca3b73899a
Merge pull request #547 from Random-Liu/glog-to-logrus
glog to logrus
2018-01-17 19:26:31 -08:00
Lantao Liu
144ff3989b Update all glog flags to log-level.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +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
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
57323b2e64
Merge pull request #546 from jcvenegas/pod-annotations
Annotations: Provide container metadata for VM based runtimes
2018-01-17 10:24:51 -08:00
Jose Carlos Venegas Munoz
b383b0261a Annotations: Provide container metadata for VM based runtimes
For hypervisor-based container runtimes (like Kata Containers, Clear Containers
or runv) a pod will be created in a VM and then create containers within the VM.

When a runtime is requested for container commands like create and start, both
the instal "pause" container and next containers need to be added to the pod
namespace (same VM).

A runtime does not know if it needs to create/start a VM or if it needs to add a
container to an already running VM pod.

This patch adds a way to provide this information through container annotations.
When starting a container or a sandbox, 2 annotations are added:

- type (Container or Sandbox)
- sandbox name

This allow to a VM based runtime to decide if they need to create a pod VM or
container within the VM pod.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
2018-01-17 09:57:20 -06:00
Lantao Liu
f0c001afa4
Merge pull request #527 from Random-Liu/add-plugin-mode
Add initial version of plugin mode
2018-01-16 11:03:49 -08:00
Lantao Liu
15940c9319 Add travis integration test for plugin mode.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-15 06:54:55 +00:00
Lantao Liu
794543065a Add script to automatically update containerd with newest cri plugin.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-15 06:54:55 +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
44cb406bb4
Merge pull request #544 from Random-Liu/update-containerd
Update containerd
2018-01-12 15:41:34 -08:00
Lantao Liu
48b2d1c806
Merge pull request #543 from mikebrow/readme-containerd-view
update readme after move to containerd
2018-01-12 15:03:24 -08:00
Lantao Liu
cdb1bf0946 Use new cio package.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-12 22:35:24 +00:00
Lantao Liu
b07017b93e Update containerd version to 90553efdef.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-12 22:34:39 +00:00
Mike Brown
d875b6ecef update readme after move to containerd
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-01-12 16:18:38 -06:00