Commit Graph

8778 Commits

Author SHA1 Message Date
Lantao Liu
447c2284cf Remove wrong comment. CRI is actually a grpc plugin of containerd now.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-06 00:45:32 +00:00
Lantao Liu
78f3df285f
Merge pull request #595 from Random-Liu/no-critest-in-release
Remove critest from release tarball.
2018-02-05 15:39:12 -08:00
Lantao Liu
5740e94338 Remove critest from release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-05 22:21:10 +00:00
Stephen Day
aa49e704e2
Merge pull request #2095 from dmcgowan/fix-whiteout-parent-directories
archive: fixes missing whiteout parent directories
2018-02-05 11:26:17 -08:00
Michael Crosby
1a4f609526
Merge pull request #2098 from dankohn/master
Change name of LICENSE
2018-02-05 10:08:13 -05:00
Dan Kohn
48d27e4e74 Change name of LICENSE
This will allow GitHub's License API to properly classify containerd as Apache
https://developer.github.com/v3/licenses/

Signed-off-by: Dan Kohn <dan@dankohn.com>
2018-02-05 09:46:28 -05:00
Michael Crosby
ae3c72c853
Merge pull request #2099 from tkporter/master
Add time type conversions for 32bit Unix platforms
2018-02-05 09:19:58 -05:00
Michael Crosby
78bd07afef
Merge pull request #1746 from AkihiroSuda/split-differ-interface
diff: resplit Applier from Differ
2018-02-05 09:18:56 -05:00
Michael Crosby
13733b6a65
Merge pull request #2100 from kunalkushwaha/testsuite-typo-fix
Testcase name corrected
2018-02-05 09:11:41 -05:00
Michael Crosby
549ec7b9dd
Merge pull request #2091 from crosbymichael/shim-size
Shim optimizations for size and cpu
2018-02-05 09:10:56 -05:00
Kunal Kushwaha
1d6047aa71 Testcase name corrected
checkUploadStatus actaully verifys contents on Updating already written buffers,
hence should be called as checkUpdateStatus

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-02-05 11:12:12 +09:00
Lantao Liu
f4625ef76c
Merge pull request #593 from Random-Liu/fix-ocicni-commit
I rebased my ocicni fork, and ruin the previous commit...
2018-02-04 12:14:26 -08:00
Trevor Porter
d994d08664 Add time type conversion for 32bit Unix platforms
Ensures the time.Unix function is given int64 arguments

Signed-off-by: Trevor Porter <trkporter@ucdavis.edu>
2018-02-03 22:36:36 +00:00
Derek McGowan
d778dd15d8
Fixes missing whiteout parent directories
Ensures include parents is called for whiteouts

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-02 17:02:14 -08:00
Lantao Liu
9f49134cc0 I rebased my fork, and ruin the previous commit...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-03 00:58:54 +00:00
Stephen Day
83cf371556
Merge pull request #2090 from AkihiroSuda/remove-wtf
vendor: update BurntSushi/toml for MIT license
2018-02-02 16:45:41 -08:00
Lantao Liu
2b8800df2b
Merge pull request #592 from Random-Liu/fix-registry-mirror
Fix registry mirror.
2018-02-02 15:37:29 -08:00
Lantao Liu
92995e29e5 Fix registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 22:52:36 +00:00
Michael Crosby
254807da5b
Merge pull request #2092 from dnephin/fix-vendor-validation
Fix vendor validation
2018-02-02 16:51:12 -05:00
Lantao Liu
b7c17ae06a
Merge pull request #585 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-02 13:18:51 -08:00
Mike Brown
bec05e31df
Merge pull request #591 from Random-Liu/update-ocicni
Update ocicni to my fork.
2018-02-02 14:30:17 -06:00
Stephen J Day
680bafea76
vendor: update BurntSushi/toml for MIT license
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-02-02 11:53:48 -08:00
Lantao Liu
d113c16802 Update ocicni to my fork.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 19:45:26 +00:00
Daniel Nephin
2125d8efc3 Fix vendor validation
vendor/ must be removed first, otherwise files added to vendor/ that aren't added to
vendor.conf will not cause the validation to fail.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-02 10:54:21 -08:00
Lantao Liu
34dd28ab32
Merge pull request #586 from Random-Liu/add-ctrcri
Add a separate CLI for cri-containerd `ctrcri`.
2018-02-02 10:43:15 -08:00
Michael Crosby
8ee29a17e6 Bump gc threshold to 40%
Doing tests, this is a better balance for the threshold in reguards to
memory and cpu usage.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-02 11:00:34 -05:00
Lantao Liu
2d61bdbb0a
Merge pull request #588 from Random-Liu/fix-registry-mirror
Use registry-1.docker.io as backup
2018-02-02 01:21:40 -08:00
Lantao Liu
3d94077144 Use registry-1.docker.io as backup
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 07:52:05 +00: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
Lantao Liu
1f1e03e001 Add a separate CLI for cri-containerd ctrcri.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-02 02:54:05 +00:00
Lantao Liu
59816f840f
Merge pull request #583 from Random-Liu/version-in-metadata
Put version into metadata so that version won't be changed across reboot.
2018-02-01 16:09:45 -08:00
Lantao Liu
05a4743d5f
Merge pull request #582 from Random-Liu/use-registry-mirror
Set registry mirror.
2018-02-01 15:23:45 -08:00
Derek McGowan
44f6bc40d4
Merge pull request #2088 from stevvooe/update-toml
vendor: update BurntSushi/toml for MIT license
2018-02-01 15:19:49 -08:00
Lantao Liu
fb8d1edb5c Put version into metadata so that version won't be changed across
restart.

Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 23:14:10 +00: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
Derek McGowan
1fd2b5783a
Add overlay options for making cleanup asynchronous
Allow configuring the overlay snapshotter to synchronously
or asynchronously do cleanup. When the driver is integrated
into a garbage collection system, the asynchronous cleanup
can reduce the time of removal and allow the longer disk
cleanup to be handled without locking the snapshotter.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-02-01 14:56:03 -08:00
Lantao Liu
c298d913b7
Merge pull request #584 from Random-Liu/add-golang-version
Add golang version in `Status` info.
2018-02-01 14:55:59 -08:00
Michael Crosby
db78450e8b Remove grpclogger from log package
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-01 17:20:49 -05:00
Michael Crosby
ea00fc793b Remove protobuf for mount in shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-02-01 17:18:40 -05:00
Lantao Liu
7ddd9255b6 Add golang version in Status info.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 20:10:39 +00:00
Lantao Liu
4165c2b8c1
Merge pull request #581 from Random-Liu/update-containerd
Update containerd to fix mount.Lookup.
2018-02-01 11:10:06 -08:00
Lantao Liu
ead704ddd3 Set registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:49:09 +00:00
Derek McGowan
ba61af665d
Merge pull request #2086 from crosbymichael/bump-cgroups
Bump cgroups to c0710c92e8b3a44681d1321dcfd1360fc5
2018-02-01 10:33:22 -08:00
Lantao Liu
a28672b088 Update containerd to fix mount.Lookup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-02-01 18:27:15 +00: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
7e1d8aafee
Merge pull request #1957 from tophj-ibm/check-for-mounts-tests
running tests in a container
2018-02-01 11:39:58 -05:00
Phil Estes
34e24997b2
Merge pull request #2081 from crosbymichael/debug
Allow tcp debug address
2018-02-01 08:15:09 +00:00
Phil Estes
ec14a97f6f
Merge pull request #2080 from crosbymichael/metrics
Update prometheus client and go-metrics
2018-02-01 08:07:50 +00:00
Phil Estes
6570c97942
Merge pull request #2084 from Random-Liu/simplify-mount-lookup
Simplify mount.Lookup.
2018-02-01 08:04:22 +00:00
Derek McGowan
1f5587247b
Merge pull request #2082 from hinshun/refactor-client-push
Refactor client push into helper function
2018-01-31 22:12:15 -08:00