github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,956 Commits 3 Branches 2 Tags 112 MiB
13bd93847d
Commit Graph

11956 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Day
8c4219dd77
Merge pull request #2014 from crosbymichael/issue-template 
Add github issue template
 2018-01-17 11:52:30 -08: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
Michael Crosby
bd8ab7944d Add github issue template 
Closes #1950

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-17 11:11:53 -05: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
Phil Estes
aaf930eaf9
Merge pull request #2009 from crosbymichael/user-path 
Support getting uid/gid from rootfs path
 2018-01-17 10:48:59 -05:00
Akihiro Suda
901a906663
Merge pull request #2012 from darrenstahlmsft/HostVersion 
Print host version in appveyor setup steps
 2018-01-17 19:48:27 +09:00
Darren Stahl
baa5c8c13b Print host version in appveyor setup steps 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2018-01-16 17:42:04 -08:00
Michael Crosby
1f5ce14a82 Support getting uid/gid from rootfs path 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-16 14:48:29 -05: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
Michael Crosby
5b042945b0 Refactor get uid/gid from path 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-16 12:01:31 -05: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
Michael Crosby
bbb5b2f15e
Merge pull request #2001 from dmcgowan/fix-whiteout-rootpath 
archive: check whiteout path before removal
 2018-01-12 15:09:11 -05:00
Derek McGowan
384d46d8bd
archive: check whiteout path before removal 
Ensure whiteout is not pointing to the current directory
or parent directory before removing. Protects against invalid
removal of the parent or current directory.

Add whiteout related tar tests using manufactured tar conditions.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2018-01-12 11:43:39 -08:00
Michael Crosby
d3292d9d2a
Merge pull request #2002 from cpuguy83/fs_check_target_stat 
copyFileInfo: do not err on chown if uid/gid match
 2018-01-12 14:31:16 -05:00
Lantao Liu
d23853e60e
Merge pull request #541 from Random-Liu/skip-node-e2e 
Skip node e2e test in travis.
 2018-01-12 10:43:14 -08:00
Michael Crosby
4a6e2975cf
Merge pull request #1994 from AkihiroSuda/fix-user 
fix running a container with config.User
 2018-01-12 12:57:31 -05:00
Akihiro Suda
1645d8406d oci: simplify WithImageConfig 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-01-12 15:46:53 +09:00
Akihiro Suda
b99dc56817 oci: add TODO comments 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-01-12 15:36:18 +09:00
Akihiro Suda
369d7c9545 oci: fix err variable scope 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-01-12 15:36:18 +09:00
Lantao Liu
00c1477c87 Remove node e2e test in travis. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-12 06:30:43 +00:00
Lantao Liu
bd8b63a993
Merge pull request #536 from mikebrow/boilerplate-upgrade 
enhanced boilerplate checking
 2018-01-11 21:18:02 -08:00
Mike Brown
bf157d2fe5 enhanced boilerplate checking 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-01-11 19:59:34 -06:00
Brian Goff
e0f8fb47bb copyFileInfo: do not err on chown if uid/gid match 
Chown would normally be a no-op if uid/gid match, however some
filesystems (e.g. NFS) will return EPERM.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-01-11 20:54:19 -05:00
Lantao Liu
f35b5924aa
Merge pull request #535 from Random-Liu/remove-reexec 
Remove reexec usage
 2018-01-11 17:29:41 -08:00
Lantao Liu
df1b027cce
Merge pull request #532 from mikebrow/docs-move-repo-update 
fix kubernetes-incubator links
 2018-01-11 17:01:46 -08:00
Lantao Liu
859fb747d2
Merge pull request #538 from Random-Liu/improve-update-vendor 
Change hack/update-vendor.sh to sync again with new vendor
 2018-01-11 16:32:26 -08:00
Mike Brown
07c8f07ba3 fix kubernetes-incubator links 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-01-11 17:50:57 -06:00
Lantao Liu
81893b70e6 Change hack/update-vendor.sh to sync again with new vendor 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 23:22:39 +00:00
Lantao Liu
8e836140bd
Merge pull request #537 from Random-Liu/fix-install-deps 
Pass PATH for containerd sudo make install.
 2018-01-11 15:18:03 -08:00
Lantao Liu
1f6f0c7b9a Pass PATH for containerd sudo make install. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 22:37:14 +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
3d72cb857a Update vendor. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-01-11 19:10:41 +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
Akihiro Suda
1167035be3 ctr: promote cOpts over opts, as oci.WithImageConfig requires snapshot 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-01-11 14:04:11 +09:00
Lantao Liu
cd255e6ac4
Merge pull request #533 from Random-Liu/rename-org 
Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.
 2018-01-10 15:55:12 -08:00
Michael Crosby
90553efdef
Merge pull request #1989 from crosbymichael/reaper 
Remove reaper from containerd daemon
 2018-01-10 18:10:15 -05:00
Michael Crosby
bf0236b457
Merge pull request #1991 from dnephin/fix-progress-panic 
Prevent panic from progress writer when console width is not available
 2018-01-10 18:09:02 -05: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
Phil Estes
0b449a4a51
Merge pull request #1982 from stevvooe/deletion-race-handling 
services/tasks, linux: ignore shutdown tasks
 2018-01-10 16:53:42 -05:00
Stephen J Day
c80ca4f4a2
services/tasks, linux: ignore shutdown tasks 
Because tasks may be deleted while listing containers, we need to ignore
errors from state requests that are due to a closed error. All of these
get mapped to ErrNotFound, which can be used to filter the entries.

There may be a better fix that does a better job of keeping track of the
intended state of a backend task. The current condition of assuming that
a closed client is a shutdown task may be too naive.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2018-01-10 11:45:33 -08:00
Daniel Nephin
8db626e6ea Dont clear lines if the console width is unavailable 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2018-01-10 14:41:16 -05:00
Daniel Nephin
c4b1684528 Use a default width of 80 
to prevent a panic when console.Size() returns 0 width.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2018-01-10 14:36:55 -05:00
Michael Crosby
9f5182f394 Remove reaper from containerd daemon 
This allows other packages and plugins to easily exec things without
racing with the reaper.

The reaper is mostly needed in the shim but can be removed in containerd
in favor of the `exec.Cmd` apis

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2018-01-10 11:51:58 -05:00