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
Michael Crosby
c63b69672e Add typeurl.Is to gate unmarshal 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-05 16:22:17 -07:00
Michael Crosby
448dc0dfa8 Replace events/convert with typeurl 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-05 16:05:49 -07:00
Michael Crosby
a60511d5aa Use typeurl package for spec types 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-05 15:37:26 -07:00
Michael Crosby
f8720382b3 Add typeurl package for TypeUrl registration 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-07-05 14:36:39 -07:00
Michael Crosby
8e1a04ff9e Merge pull request #1126 from razic/typo-fix 
fixes typo in proto comment
 2017-07-03 10:58:20 -07:00
Kenfe-Mickaël Laventure
193750e1a5 Merge pull request #1127 from sameo/topic/typo 
linux: Make containerd less runc specific
 2017-07-03 10:57:37 -07:00
Zachary Adam Kaplan
a28a871d44 fixes typo in comment 
Signed-off-by: Zachary Adam Kaplan <razic@viralkitty.com>
 2017-07-03 17:48:14 +00:00
Samuel Ortiz
b67398af15 linux: Make containerd less runc specific 
We hope that containerd supports any OCI compliant runtime, and not only
runc.
This patch fixes all the error messages to not be completely runc
specific and change the initProcess structure to have its runtime
pointer be called 'runtime' and not 'runc'

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
 2017-07-03 17:45:23 +02:00
Michael Crosby
3448c6bafb Merge pull request #1113 from dmcgowan/snapshot-namespaces 
Snapshot namespaces
 2017-06-30 16:36:40 -07:00
Michael Crosby
2bbd7d213e Merge pull request #1050 from stevvooe/container-filters 
cmd/ctr, service/containers: implement container filter
 2017-06-30 15:54:14 -07:00
Derek McGowan
8bd8030ede Merge pull request #1123 from tonistiigi/fix-diskusage 
fs: fix hardlinks detection on usage calc
 2017-06-30 15:48:47 -07:00
Tonis Tiigi
6c11da2880 fs: fix hardlinks detection on usage calc 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-30 15:33:08 -07:00
Phil Estes
3456dc6cb8 Merge pull request #1121 from stevvooe/grpc-errors-test 
errdefs: add tests error conversions
 2017-06-30 17:37:01 -04:00
Michael Crosby
5b9953cebf Merge pull request #1122 from stevvooe/rename-fifoset 
containerd: rename FifoSet to FIFOSet
 2017-06-30 14:34:36 -07:00
Stephen J Day
d738d6d1e4
containerd: rename FifoSet to FIFOSet 
Per Go's style guidelines, `Fifo` should be `FIFO` since it is an
initialism.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-30 14:16:56 -07:00
Stephen J Day
397f405f63
errdefs: add tests error conversions 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-30 11:51:41 -07:00
Stephen J Day
396d89e423
cmd/ctr, service/containers: implement container filter 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-30 11:49:16 -07:00
Phil Estes
3332042ab6 Merge pull request #1117 from AkihiroSuda/fix-root-test 
*_test.go: fix test conditions
 2017-06-30 12:35:29 -04:00
Kenfe-Mickaël Laventure
e7ba3fb600 Merge pull request #1098 from crosbymichael/ropts 
Implement options for runtime specific settings
 2017-06-30 08:46:29 -07:00
Akihiro Suda
eeb74d4e23 *_test.go: fix test conditions 
- add `testutil.RequiresRoot()` to TestMain
- moved `if testing.Short{ t.Skip() }` from each of the tests into a
common `newClient()`

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-30 04:00:59 +00:00
Lantao Liu
2a2d709af7 Merge pull request #100 from Random-Liu/remove-out-dated-TODOs 
Remove out-of-date TODOs.
 2017-06-29 19:31:06 -07:00
Lantao Liu
faf592069b Remove out-of-date TODOs. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-30 01:19:51 +00:00
Stephen Day
8a00710af8 Merge pull request #1120 from crosbymichael/ctdid 
Metrics id -> container_id
 2017-06-29 17:08:07 -07:00
Michael Crosby
a1eaa6b8c5 Metrics id -> container_id 
Make sure we use container id as the id saved in the metrics labels

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-29 16:23:10 -07:00
Derek McGowan
3db8adc5d7
Update plugin load and snapshot service 
Allow plugins to be mapped and returned by their ID.
Add skip plugin to allow plugins to decide whether they should
be loaded.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-29 16:16:26 -07:00
Derek McGowan
5b105f86ce
Fix rootfs error message extra format variable 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-29 16:16:26 -07:00
Derek McGowan
4ba4f3a1d5
Add namespaced snapshotter implementation 
The namespaced snapshotter wraps an existing snapshotter and
enforces namespace.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-29 16:16:26 -07:00
Kenfe-Mickael Laventure
ccbe92dc08 Move WithExit to runcopts package 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-29 15:50:39 -07:00
Michael Crosby
124f430d44 Update base types url for runc opts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-29 15:44:23 -07:00
Michael Crosby
96dbb08ec4 Change runtime options to *Any 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-29 15:35:13 -07:00
Michael Crosby
72831b6985 Use Any instead of []byte 
This allows us to get the fully TypeURL for consuming code.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-29 15:32:45 -07:00
Michael Crosby
82d0208aaa Implement options for runtime specific settings 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-06-29 15:32:45 -07:00
Derek McGowan
7ddf411ea8
Revert "snapshot/storage: namespace snapshot drivers" 
This reverts commit b1a70aa335.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-06-29 15:32:07 -07:00
Derek McGowan
eedcbc64cc Merge pull request #1115 from stevvooe/consolidate-errors 
errdefs: centralize error handling
 2017-06-29 15:18:24 -07:00
Stephen J Day
a4fadc596b
errdefs: centralize error handling 
Now that we have most of the services required for use with containerd,
it was found that common patterns were used throughout services. By
defining a central `errdefs` package, we ensure that services will map
errors to and from grpc consistently and cleanly. One can decorate an
error with as much context as necessary, using `pkg/errors` and still
have the error mapped correctly via grpc.

We make a few sacrifices. At this point, the common errors we use across
the repository all map directly to grpc error codes. While this seems
positively crazy, it actually works out quite well. The error conditions
that were specific weren't super necessary and the ones that were
necessary now simply have better context information. We lose the
ability to add new codes, but this constraint may not be a bad thing.

Effectively, as long as one uses the errors defined in `errdefs`, the
error class will be mapped correctly across the grpc boundary and
everything will be good. If you don't use those definitions, the error
maps to "unknown" and the error message is preserved.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-06-29 15:00:47 -07:00
Stephen Day
fb7f43f1a8 Merge pull request #1118 from AkihiroSuda/fix-integration 
Makefile: fix INTEGRATION_PACKAGE
 2017-06-29 13:59:46 -07:00
Stephen Day
41273b44e5 Merge pull request #1116 from AkihiroSuda/fix-import 
image.go: fix duplicated import
 2017-06-29 11:08:25 -07:00
Kenfe-Mickaël Laventure
5486d1ba1e Merge pull request #1114 from crosbymichael/pids 
Change ListProcesses to ListPids
 2017-06-29 07:50:45 -07:00
Akihiro Suda
2c293429f3 Makefile: fix INTEGRATION_PACKAGE 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-29 06:50:36 +00:00
Akihiro Suda
696e383d21 image.go: fix duplicated import 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-06-29 06:15:36 +00:00
Mike Brown
7174310f95 Merge pull request #99 from Random-Liu/change-log-level-for-cri-test 
Change containerd log level to debug for cri validation test.
 2017-06-28 22:09:12 -05:00
Mike Brown
ad041f01ca Merge pull request #97 from Random-Liu/bump-up-critools-version 
Upgrade cri-tools to v0.1.
 2017-06-28 22:08:56 -05:00
Lantao Liu
a2c4cc206e Merge pull request #98 from Random-Liu/not-teardown-network-for-hostnetwork 
Do not teardown network namespace when using host network.
 2017-06-28 19:53:39 -07:00
Lantao Liu
4262de9e53 Change containerd log level to debug for cri validation test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-29 01:55:39 +00:00
Lantao Liu
4c48ad780f Do not teardown network namespace when using host network. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-29 01:30:04 +00:00
Lantao Liu
a41412ae8c Merge pull request #94 from Random-Liu/add-test-doc 
Add cri-containerd test document for developer.
 2017-06-28 18:21:50 -07:00
Lantao Liu
149e305ce3 Upgrade cri-tools to v0.1. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-29 01:13:34 +00:00
Lantao Liu
06a3949b87 Add cri-containerd test document for developer. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-06-29 01:08:56 +00:00
Lantao Liu
9e087e14f1 Merge pull request #89 from mikebrow/readme-userguide 
README.md updates for the alpha
 2017-06-28 17:01:41 -07:00
Mike Brown
0cb4ea2a7b README.md updates 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2017-06-28 18:45:09 -05:00