Commit Graph

8778 Commits

Author SHA1 Message Date
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
Kenfe-Mickaël Laventure
823d3398ea
Merge pull request #2023 from crosbymichael/exec-state
Add Exec to process states
2018-01-18 14:48:38 -08:00
Michael Crosby
2a730264aa Add Exec to process states
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-18 17:05:15 -05: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
Michael Crosby
ba84c5fb38
Merge pull request #2019 from stevvooe/remove-log-modules
log: remove log "module" system
2018-01-18 14:34:51 -05:00
Stephen J Day
5cab90d270
log: remove log "module" system
After comtemplation, the complexity of the logging module system
outweighs its usefulness. This changeset removes the system and restores
lighter weight code paths. As a concession, we can always provide more
context when necessary to log messages to understand them without having
to fork the context for a certain set of calls.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-18 11:22:13 -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
Michael Crosby
e1321c51a6
Merge pull request #2022 from denverdino/master
Fix NPE in dialer
2018-01-18 13:18:34 -05:00
Li Yi
adfa9a2402 Fix NPE in dialer
Signed-off-by: Li Yi <denverdino@gmail.com>
2018-01-18 18:41:24 +08:00
Lantao Liu
6fadb7f5e9 Minor code cleanup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-18 07:31:16 +00:00
Akihiro Suda
507a149488 cio: add WithFIFODir opt
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-01-18 14:33:56 +09: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
Stephen Day
acc6011ac1
Merge pull request #1960 from dmcgowan/images-removal-dirty
metadata: image removal triggers GC
2018-01-17 13:58:39 -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
Phil Estes
80fc1f2d07
Merge pull request #2011 from darrenstahlmsft/ResolveErrors
Provide better error context on resolve failures
2018-01-17 16:42:40 -05:00
Darren Stahl
1338a4f022 Provide better error context on resolve failures
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-01-17 13:22:54 -08:00
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