Commit Graph

232 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
55118c5469
Update go-winio and hcsshim
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-01 18:04:25 +02:00
Akihiro Suda
d88de4a34f content: change Writer/ReaderAt to take OCI
This change allows implementations to resolve the location of the actual data
using OCI descriptor fields such as MediaType.

No OCI descriptor field is written to the store.

No change on gRPC API.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-06-01 11:51:43 +09:00
Akihiro Suda
17a54d02c4 update cri vendor
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-05-31 17:37:16 +09:00
Derek McGowan
1e8b09cfc6
Merge pull request #2353 from ehazlett/process-runtime
linux -> runtime/linux
2018-05-30 10:06:36 -07:00
Michael Crosby
c7083eed5d
Merge pull request #2369 from dmcgowan/update-grpc
Update grpc to 1.12
2018-05-30 11:07:10 -04:00
Evan Hazlett
6653917ef9 vendor update
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 09:23:10 -04:00
Evan Hazlett
8d768689fa cri vendor bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2018-05-30 09:15:24 -04:00
Derek McGowan
d2fc059229
Update grpc to 1.12
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-05-25 13:22:18 -07:00
Michael Crosby
024a4210c7 Update continuity to d3c23511c1bf5851696cba83143d9
This includes updates for resolving links on windows.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-25 14:50:32 -04:00
Brian Goff
7e5a91fa51 Bump continuity to fix copy files > 2^32 bytes
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-05-23 20:53:14 -04:00
Darren Stahl
07d8716004 Update hcsshim to v0.6.10
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-05-02 16:19:15 -07:00
Ian Campbell
623407a399 Re-vndr with newest vndr
This seems to pickup a bunch of *.c files and some other changes which follow
from having included some new packages because of that.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-05-01 00:18:17 +01:00
Ian Campbell
388c73052a Bump to latest go-digest.
This renames the license file (so automated tooling can find it, which I care
about) and also pulls in some documentation and comment changes, plus some
functional changes:

PR#33 -- future-proof the algorithm field.
PR#34 -- disallow upper case in hex portion.

No changes appear to be required to containerd code.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2018-04-30 23:38:02 +01:00
Andrei Vagin
0846d6f8e9 vendor: update go-runc
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
2018-04-27 23:45:54 +03:00
Lantao Liu
9c9abec21c Update cri plugin to v1.0.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-23 16:34:17 -07:00
Lantao Liu
6da553e112 Update cri plugin to v1.0.0-rc.2.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-13 07:01:48 +00:00
Stephen J Day
caac3bca3e
protobuf: remove generated google/rpc files
We move from having our own generated version of the googleapis files to
an upstream version that is present in gogo. As part of this, we update
the protobuf package to 1.0 and make some corrections for slight
differences in the generated code.

The impact of this change is very low.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-04-05 14:36:32 -07:00
Lantao Liu
89d74986cc Update cri plugin to v1.0.0-rc.1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 21:11:38 +00:00
Derek McGowan
ac5432a06b
Merge pull request #2253 from stevvooe/report-zfs-correctly
vendor: update zfs dependency
2018-03-29 18:30:57 -07:00
Stephen J Day
ca4ccf4afc
vendor: update zfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 14:48:12 -07:00
Stephen J Day
bea2304ca4
vendor: update aufs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 13:33:10 -07:00
Lantao Liu
8958b489ba Update to cri v1.0.0-rc.0
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-26 22:24:25 +00:00
Stephen J Day
ab8e05ac50
cmd/containerd: include aufs by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-23 11:27:12 -07:00
Michael Crosby
3e8e9d3ed7
Merge pull request #2223 from dmcgowan/with-lease-context
lease: pass in context to lease done function in client
2018-03-23 10:27:39 -04:00
Derek McGowan
43d0a5cb60
Pass in context to lease done function in client
Allows the client to choose the context to finish the lease.
This allows the client to switch contexts when the main context
used to the create the lease may have been cancelled.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 14:09:24 -07:00
Derek McGowan
9b111bdc39
Add ignore socket test
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-22 13:17:33 -07:00
Phil Estes
f5d7bfb56e
Merge pull request #2213 from crosbymichael/runc
Bump runc to 69663f0bd4b60df09991c08812a60108003fa
2018-03-16 12:54:54 +02:00
Michael Crosby
f117459c35 Bump runc to 69663f0bd4b60df09991c08812a60108003fa
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-15 14:14:41 -04:00
Stephen J Day
f4113a903a
containerd: include zfs plugin by default
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-14 10:29:23 -07:00
Lantao Liu
9460f94c10 Update containerd/cri to 0c87604068
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-14 01:11:29 +00:00
Stephen Day
3013762fc5
Merge pull request #2203 from Random-Liu/support-in-process-integration
Support in process integration
2018-03-12 14:38:27 -07:00
Lantao Liu
ba93435337 Temporary cri-containerd change
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-12 18:03:50 +00:00
Phil Estes
e38b2bbc3f
Update cgroups vendor for license headers/bug fix
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-03-09 15:54:13 -05:00
Michael Crosby
179382028a Update containerd deps
This includes general fixes and the license change where the license is
included in all files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-03-08 13:57:30 -05:00
Stephen J Day
23751c9ced
vendor: update btrfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-06 13:16:56 -08:00
Stephen J Day
9cdd036393
build: bump to Go 1.10
Bumps the build to use Go 1.10, which allows us to drop the forked tar
package.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-26 16:47:24 -08:00
Lantao Liu
ad04781e3e Update cri-containerd to 5bd99af7db
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-24 00:09:26 +00:00
Derek McGowan
5bd99af7db
Merge pull request #2097 from Random-Liu/vendor-cri-plugin
Vendor cri plugin into containerd.
2018-02-23 13:55:13 -08:00
Eli Uriegas
735114f500 Update continuity vendor to d8fb85
Includes a fix for 32bit systems

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-02-17 00:23:42 +00:00
Lantao Liu
fa91b905e9 Update vendors.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-16 23:23:47 +00:00
Derek McGowan
ca3eb742fd
Update continuity vendor
Picks up fix for consecutive directory deletion

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-12 10:45:15 -08:00
Daniel Nephin
1719a6e17a Vendor gotestyourself
and remove testify and spew

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-12 12:26:23 -05:00
Stephen Day
ee6ffdd91e
Merge pull request #2116 from crosbymichael/bump-runc
Update runc to a618ab5a0186905949ee463dbb762c3d23e
2018-02-08 15:09:43 -08:00
Michael Crosby
73837b11db Update runc to a618ab5a0186905949ee463dbb762c3d23e
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-08 11:30:24 -05:00
Brian Goff
c776b6d8d9 Use continuity fs package
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-07 12:40:52 -05:00
Michael Crosby
9745a4d448 Update ttrpc to d4528379866b0ce7e9d71f3eb96f0582fc
Contains the OnClose method for the client

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-06 10:27:36 -05:00
Akihiro Suda
36a2deb029 vendor: update BurntSushi/toml for MIT license
Follow-up to #2088

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-02-02 15:51:57 +09:00
Stephen J Day
85678e1885
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-01 14:58:31 -08:00
Michael Crosby
5915c9ab5e Bump cgroups to c0710c92e8b3a44681d1321dcfd1360fc5
This fixes performance issues with walking `/dev` to get device paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-01 11:43:42 -05:00
Michael Crosby
7615153271 Update prometheus client and go-metrics
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-31 10:12:41 -05:00
Michael Crosby
2f06259a84 Revert "Add github.com/json-iterator/go to vendor"
This reverts commit 43a9473a53.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-29 15:47:58 -05:00
Michael Crosby
43a9473a53 Add github.com/json-iterator/go to vendor
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 16:32:55 -05:00
Michael Crosby
8f75d658d7 Add syndtr/gocapability to vendor
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 14:31:19 -05:00
Stephen J Day
f534a20173
vendor: update go-runc to reduce gc pressure
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-24 16:19:24 -08:00
Michael Crosby
8dfbd59e60 Update runc to 9f9c96235cc97674e935002fc3d78361b69
This fixes issues for init and exec hanging forever when an error
happends on start.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-23 10:05:26 -05:00
Stephen J Day
87cb12de32
vendor: update ttrpc for shutdown fix
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-01-09 16:13:43 -08:00
Michael Crosby
e479165a38
Merge pull request #1903 from darrenstahlmsft/ArchiveOpts
Implement Archive.apply on Windows
2018-01-02 16:08:36 -05:00
Michael Crosby
a0f7bbb103 Update runc to 7f24b40cc5423969b4554ef04ba0b00e2
This includes fixes for file joining and apparmor without cgo.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-12-15 11:30:22 -05:00
Darren Stahl
c71bee7b8a Vendor go-winio
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-12-11 11:43:42 -08:00
Sebastiaan van Stijn
8b1fd0875a Bump runtime-spec and image-spec to 1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-05 23:12:36 -08:00
Sebastiaan van Stijn
0eec9c078a
Fix missing libcontainer syscall file
I noticed this file showed up when revendoring dependencies
with vndr.

Also removed `github.com/Microsoft/opengcs` from vendor.conf
as it was not used;

    2017/12/05 22:41:58 WARNING: package github.com/Microsoft/opengcs is unused, consider removing it from vendor.conf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-12-05 22:52:50 -08:00
Stephen J Day
4b36430425
vendor: update ttrpc to pull in euid change
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-12-01 12:08:15 -08:00
Stephen J Day
2d966df174
cmd/containerd-shim: require unix socket credentials
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-30 20:34:29 -08:00
Kenfe-Mickaël Laventure
6bff39c643
Merge pull request #1837 from crosbymichael/bump-cgroups
Update cgroups to 29da22c6171a4316169f9205ab6c49f5
2017-11-30 08:03:22 -08:00
Michael Crosby
4349df4554 Update cgroups to 29da22c6171a4316169f9205ab6c49f5
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-11-30 10:15:37 -05:00
Stephen J Day
393cf8e8fc
vendor: update ttrpc with latest changes
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-29 21:37:50 -08:00
Darren Stahl
444e4220c2
Revendor hcsshim and go-tar
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-11-28 16:19:56 -08:00
Stephen J Day
d54961ccaa
vendor: add ttrpc as vendored dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-27 18:22:37 -08:00
Stephen J Day
50532f231a
api: use weak imports for plugin protobufs
Because of a side-effect import, we have the possibility of pulling in
several unnecessary packages that are used by the plugin and not at
runtime to implement protobuf structures. Setting these imports to
`weak` prevents this from happening, reducing the total import set,
reducing memory usage and binary size.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-16 20:18:15 -08:00
Stephen J Day
f4fdb940ed vendor: include require package from testify
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-16 16:13:13 -05:00
Stephen J Day
35697865c0
vendor: update protobuf, grpc and gogo
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-11-09 13:24:41 -08:00
Michael Crosby
9d05197f96 Update cli to 7bc6a0acffa589f415f88aca16cc1de5ffd6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-26 15:17:22 -04:00
Michael Crosby
8feebb7513 Bump runc to 74a17296470088de3805e138d3d87c62e613d
This bumps the runc version to 74a17296470088de3805e138d3d87c62e613dfc4
that includes various fixes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-20 10:58:04 -04:00
Kenfe-Mickael Laventure
7c9be56930
Update containerd/cgroups to f7dd103d3e4e696aa67152f6b4ddd1779a3455a9
This fixes a leak of the oom_control eventfd to child processes.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-19 07:55:16 -07:00
Kenfe-Mickael Laventure
90c535521a
Vendor go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
This fixes possible panics in Run & Restore when done without IOs

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-18 13:24:12 -07:00
Michael Crosby
d805f77f50 Bump cgroups dep to 38a61430f7ceb01581fba6dd7ead48
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-10-12 14:24:16 -04:00
Kenfe-Mickael Laventure
c807ba8379
Allow setting the uid & gid of the io pipes
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-10-10 13:24:12 -07:00
Lantao Liu
28ca8f05d3 Fix task load.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-05 21:03:24 +00:00
Michael Crosby
cf2c4609bd Bump runc with console change for ONLCR
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-26 11:01:40 -04:00
Michael Crosby
ed811896ed Update console dep to 84eeaae905fa414d03e07bcd6c8d
This change removes the ClearONLCR from the console package providing
a console with the default settings from the console package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-26 10:17:23 -04:00
Michael Crosby
781ce658c8 Update console dep to b28c739c79ce69d017e3691ad366
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-20 11:16:56 -04:00
Michael Crosby
d22160c28e Vendor typeurl package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-19 09:43:55 -04:00
Michael Crosby
77f699ccc7 Update runc to 593914b8bd5448a93f7c3e4902a03408b6d
This bumps runc to the newest version as of this date.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 14:24:24 -04:00
Kenfe-Mickaël Laventure
e66d1a7961 Merge pull request #1468 from crosbymichael/stats
Add Metrics endpoint to tasks
2017-09-06 14:59:55 -07:00
Michael Crosby
2ed3c62e27 Update cgroups to 5933ab4dc4f7caa3a73a1dc141bd11f4
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-06 16:20:19 -04:00
Kenfe-Mickael Laventure
f766801a99
Update go-runc to b3c048c028ddd789c6f9510c597f8b9c62f25359
This fixes an issue with Exec not returning a proper error

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-09-06 08:09:09 -07:00
Michael Crosby
f45269be6b Update cgroups to 4be134fe43b9e207558365ad2675546b
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-05 17:26:26 -04:00
Michael Crosby
0973a084cf Update cgroups to e364e5d4183340acdf51f943ba033543
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-05 17:26:26 -04:00
Kenfe-Mickael Laventure
939ad32117
Update go-runc to ba22f6a82e52be3be4eb4a00000fe816f4b41c2e
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-09-01 14:50:56 -07:00
Michael Crosby
6b4c4a2937 Update reaper for multipe subscribers
Depends on https://github.com/containerd/go-runc/pull/24

The is currently a race with the reaper where you could miss some exit
events from processes.

The problem before and why the reaper was so complex was because
processes could fork, getting a pid, and then fail on an execve before
we would have time to register the process with the reaper.  This could
cause pids to fill up in a map as a way to reduce the race.

This changes makes the reaper handle multiple subscribers so that the
caller can handle locking, for when they want to wait for a specific
pid, without affecting other callers using the reaper code.

Exit events are broadcast to multiple subscribers, in the case, the runc
commands and container pids that we get from a pid-file.  Locking while
the entire container stats no longs affects runc commands where you want
to call `runc create` and wait until that has been completed.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-31 14:29:47 -04:00
Darren Stahl
4a782f7b54 Vendor opengcs and hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-08-28 15:07:51 -07:00
Michael Crosby
5c7f67186a Add libcontainer/user package for passwd parsing
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-24 10:32:16 -04:00
Michael Crosby
77836a6c27 Update cgroups to e6d1aa8c71c6103624b2c6e6f4be0863
This bumps the cgroups package with various fixes to logging and net_cls
changes.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-21 16:17:18 -04:00
Derek McGowan
0e28f2c76e
Update mount creation to only use btrfs subvolume id
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-08-16 13:00:54 -07:00
Michael Crosby
fa3454e54d Update go-runc to b85ac701de5065a66918203dd18f05
This includes fixes for pipe ownership and NullIO options.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-11 17:15:25 -04:00
Edward Pilatowicz
534a137ed3 vendor: update github.com/containerd/console
Signed-off-by: Edward Pilatowicz <edward.pilatowicz@oracle.com>
2017-08-02 17:25:29 -07:00
Edward Pilatowicz
47637f2aa2 vendor: update github.com/containerd/continuity
Signed-off-by: Edward Pilatowicz <edward.pilatowicz@oracle.com>
2017-08-02 17:22:33 -07:00
Stephen J Day
610e1a250d
vendor: update OCI image-spec dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-08-02 14:08:13 -07:00
Stephen Day
92d737f4ae Merge pull request #1259 from dqminh/epoll-io
Use Epoll to perform I/O in linux
2017-07-31 13:47:41 -07:00
Michael Crosby
2386062ce1 Update runc to e775f0fba3ea329b8b766451c892c41a3d4
This resolves logrus issues with containerd not being in sync with the
version runc is using.

This also updates the OCI runtime spec to v1.0.0

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-31 14:33:49 -04:00