github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
833 Commits 3 Branches 4 Tags
2b6f084f36498cb65b2f7ffd58a97816186e47ef
Commit Graph

364 Commits

Author SHA1 Message Date
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
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
62e6921145 Use containerd grpc server 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-18 18:51:18 +00: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
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
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
cdb1bf0946 Use new cio package. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-12 22:35:24 +00:00
Lantao Liu
8782f18d50 Add integration test for volume copy up. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 19:10:52 +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
5bfa5e451a Merge pull request #528 from cpuguy83/skip_selinux_test 
Minor cleanup on selinux test
 2018-01-09 16:30:41 -08:00
Brian Goff
2a07847d67 Use t.Run() instead of t.Log() for subtest log 
Signed-off-by: Brian Goff <brian.goff@docker.com>
 2018-01-09 15:45:13 -05:00
Brian Goff
96484eb3e7 Use t.Skip() when selinux is not enabled 
Signed-off-by: Brian Goff <brian.goff@docker.com>
 2018-01-09 15:43:56 -05: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
aee7a366f3 Merge pull request #525 from abhi/cniip 
Caching IP allocated by CNI plugin
 2018-01-05 00:27:48 -08:00
abhi
f1dbc0b375 Caching IP allocated by CNI plugin 
Signed-off-by: abhi <abhi@docker.com>
 2018-01-04 20:00:55 -08:00
Lantao Liu
31bc964195 Enable HostSpecific option in runtime-tools generator. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-03 19:04:47 +00:00
Lantao Liu
cebe1b39f7 Remove default rlimits. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-02 18:53:01 +00:00
Lantao Liu
b701b0e496 Add our own DeepCopy. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-16 00:23:14 +00:00
Lantao Liu
737efe70a7 Merge pull request #493 from Random-Liu/minor-cleanup 
Minor cleanup.
 2017-12-12 23:30:47 -08:00
Lantao Liu
e4753edf0a Minor cleanup. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-13 03:15:01 +00:00
yason
6c9a837b7a cleanup some comment for removeImage 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-13 10:07:52 +08:00
Lantao Liu
a9c7237e67 Merge pull request #470 from mikebrow/debug-image 
adding info map for verbose image status
 2017-12-12 15:09:57 -08:00
Mike Brown
31223fd5b1 adds oci image spec to image info placed into imagestore 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-12 15:58:07 -06:00
Lantao Liu
cbda4256cd Merge pull request #487 from yanxuean/image-improve 
improve image
 2017-12-12 11:58:43 -08:00
Mike Brown
03ac989644 adding info map for verbose image status 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-12 13:44:08 -06:00
Lantao Liu
c9b279bb79 Merge pull request #479 from Random-Liu/improve-container-sandbox-status 
Improve container sandbox status
 2017-12-12 11:42:51 -08:00
yason
5f6d9a5fcc reliably remove image when content missing 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-12 18:44:59 +08:00
yason
4762b3e273 remove taskService and imageStoreService 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-12 16:51:22 +08:00
Lantao Liu
f4c572fba7 Add restart test for sandbox recovery. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-11 21:21:08 +00:00
Lantao Liu
dd017e6e6c Move less important function to the end. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-11 18:45:57 +00:00
Lantao Liu
b25b06577e Improve container and sandbox status. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-11 18:45:56 +00:00
yason
41c8763e2b improve calling for content 
Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-11 15:28:10 +08:00
Mike Brown
220411b73b adding info map for verbose pod status 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-05 19:40:39 -06:00
Lantao Liu
11eb24c26f Merge pull request #475 from Random-Liu/order-container-status-fields 
Use one big info struct before we change info to an array.
 2017-12-05 14:37:36 -08:00
Lantao Liu
85b943eb47 Use one big info struct before we change info to an array. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-05 21:37:12 +00:00
Lantao Liu
266e49a3bf Merge pull request #471 from yanxuean/improve-unmount 
Improve unmount for snapshot
 2017-12-05 09:54:05 -08:00
yason
2a25cf7c1f sync Unmount for snapshot 
best effort to remove temp dir for snapshot

Signed-off-by: yason <yan.xuean@zte.com.cn>
 2017-12-05 19:05:32 +08:00
Lantao Liu
572e354a2d Revert debug code. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-05 07:40:11 +00:00
Lantao Liu
562eb725c7 Merge pull request #458 from mikebrow/boilerplate-update 
fixes for boilerplate
 2017-12-04 10:03:41 -08:00
Mike Brown
bd6d530290 Merge pull request #463 from Random-Liu/dump-rootfs 
Check and dump rootfs.
 2017-12-03 09:23:04 -06:00
Lantao Liu
a23bdf25d8 Check and dump rootfs. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-03 11:39:54 +00:00
abhi
43c05efb22 Revert: Setting containerd shim cgroup same as pod cgroup 
Signed-off-by: abhi <abhi@docker.com>
 2017-12-01 16:03:38 -08:00
Mike Brown
009e40f280 correct some boilerplates 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-12-01 16:56:25 -06:00
Lantao Liu
181d7d5076 Move shim cgroup opts to pkg/containerd/opts. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-12-01 19:18:26 +00:00
abhi
0d6774f4af Setting containerd shim cgroup same as pod cgroup 
Signed-off-by: abhi <abhi@docker.com>
 2017-12-01 08:33:50 -08:00
Lantao Liu
0db6e04ba1 Merge pull request #447 from Random-Liu/update-containerd 
Update containerd to fix long exec issue.
 2017-11-30 12:58:24 -08:00