Michael Crosby
0293cbd26c
Merge pull request #3588 from katiewasnothere/exposeEventPublisher
...
Export shim publisher functions
2019-08-28 11:55:32 -04:00
Michael Crosby
d177ffd309
Merge pull request #3590 from tanjunchen/fix-grammar-mistake
...
fix-grammar-mistake
2019-08-28 10:39:20 -04:00
chentanjun
92a5b08a68
fix-grammar-mistake
...
Signed-off-by: chentanjun <2799194073@qq.com>
2019-08-28 16:10:08 +08:00
Kathryn Baldauf
2d8a65b1b2
Export shim publisher functions
...
- Our out of tree shim would like to publish events with ttrpc. These
functions should be exposed so our shim doesn't need to reimplement
publisher logic.
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2019-08-27 17:15:15 -07:00
Michael Crosby
309617819b
Merge pull request #3582 from fuweid/me-cleanup-issue-CreateDiff
...
rootfs: use new ctx to cleanup instead of canceled one
2019-08-27 09:18:31 -04:00
Michael Crosby
cbfff2fb78
Merge pull request #3585 from tanjunchen/fix-up-spelling-mistake
...
fix-up spelling mistake
2019-08-27 08:51:33 -04:00
Wei Fu
32ceb628c2
Merge pull request #3581 from thaJeztah/bump_grpc
...
bump google.golang.org/grpc v1.23.0 (CVE-2019-9512, CVE-2019-9514, CVE-2019-9515)
2019-08-27 15:12:34 +08:00
chentanjun
8266a3c5e7
fix-up spelling mistake
...
Signed-off-by: chentanjun <2799194073@qq.com>
2019-08-27 13:45:41 +08:00
Wei Fu
09b184c15a
rootfs: use new ctx to cleanup instead of canceled one
...
rootfs.CreateDiff might be canceled by context for some reason. Based on
this case, the defer function should use the new ctx to do cleanup
temporary snapshotter instead of the canceled one.
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-08-27 11:27:34 +08:00
Sebastiaan van Stijn
2f54a7cb6b
bump containerd/ttrpc 9abb3e268010ea188f4e4051f77eb5aca49315fb
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 23:24:22 +02:00
Sebastiaan van Stijn
eb7a6bf02c
bump google.golang.org/grpc v1.23.0
...
full diff: https://github.com/grpc/grpc-go/compare/v1.20.1...v1.23.0
This update contains security fixes:
- transport: block reading frames when too many transport control frames are queued (grpc/grpc-go#2970 )
- Addresses CVE-2019-9512 (Ping Flood), CVE-2019-9514 (Reset Flood), and CVE-2019-9515 (Settings Flood).
Other changes can be found in the release notes:
https://github.com/grpc/grpc-go/releases/tag/v1.23.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 23:24:20 +02:00
Derek McGowan
d618c80077
Merge pull request #3584 from ehazlett/with-image-name
...
WithImageName container opt
2019-08-26 13:42:47 -07:00
Derek McGowan
cde03a0a2b
Merge pull request #3583 from Random-Liu/handle-duplicated-layer
...
Handle layers with the same digest in unpacker.
2019-08-26 13:08:19 -07:00
Michael Crosby
df84e546b5
Merge pull request #3577 from dmcgowan/change-default-manifest-download
...
[carry #3127 ] Update pull default to skip all platform manifests
2019-08-26 15:04:15 -04:00
Lantao Liu
56bcc77679
Handle layers with the same digest in unpacker.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-26 11:31:33 -07:00
Evan Hazlett
6f8fb9ee5d
add WithImageName container opt
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2019-08-26 14:29:17 -04:00
Derek McGowan
a40c3830df
Add option to pull all metadata
...
Add flags to pull and fetch to grab all metadata.
Add fetch option to pull only metadata.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-26 11:05:21 -07:00
Michael Crosby
dfd76b3484
Merge pull request #3579 from thaJeztah/bump_hashicorp_deps
...
Bump hashicorp deps
2019-08-26 11:44:46 -04:00
Phil Estes
3ad49a208b
Merge pull request #3578 from sofat1989/containerd-stress
...
update the max if cur will be greater than max for setting the limit
2019-08-26 05:57:40 -07:00
Sebastiaan van Stijn
55f737bd32
bump hashicorp/golang-lru v0.5.3
...
full diff: https://github.com/hashicorp/golang-lru/compare/v0.5.1...v0.5.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-26 13:40:08 +02:00
Sebastiaan van Stijn
ed1df65c25
bump hashicorp/go-multierror v1.0.0
...
full diff: ed905158d8
2019-08-26 13:37:53 +02:00
Sebastiaan van Stijn
cbb3a3790e
bump hashicorp/errwrap v1.0.0
...
full diff: 7554cd9344
2019-08-26 13:36:33 +02:00
fesu
5cab0d3f3f
update the max if cur will be greater than max for setting the limit
...
Signed-off-by: Su Fei <sofat1989@126.com>
2019-08-26 15:09:01 +08:00
Yu Yi
aae2d0d754
delete unnecessary checks and fix a test
...
Signed-off-by: Yu Yi <yiyu@google.com>
2019-08-23 14:02:56 -07:00
Yu Yi
9e183f5e52
add cli option to download all manifests
...
- Add `all-manifests` option to both `ctr content fetch` and `ctr
images pull`. By default it is false.
- This option ties to `AppendDistributionSourceLabel` in client.
Signed-off-by: Yu Yi <yiyu@google.com>
2019-08-23 14:02:56 -07:00
Michael Crosby
4a2f61c4f2
Merge pull request #2918 from Random-Liu/parellel-unpack
...
Add simultaneous unpack support
2019-08-23 15:06:03 -04:00
Derek McGowan
a1f4ffb211
Merge pull request #3575 from crosbymichael/seccom2.3
...
Pin to libseccomp 2.3.3
2019-08-23 10:06:37 -07:00
Michael Crosby
b5f03eacd3
Pin to libseccomp 2.3.3
...
lib seccomp 2.4 has huge performance regressions.
This change pins to 2.3.3 where that is not an issue
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-23 15:19:38 +00:00
Derek McGowan
80ed8e1a64
Merge pull request #3573 from crosbymichael/ttrpc-env
...
Pass ttrpc address to shim via env
2019-08-22 14:08:59 -07:00
Michael Crosby
6cf031e1e4
Pass ttrpc address to shim via env
...
Because of the way go handles flags, passing a flag that is not defined
will cause an error. In our case, if we kept this as a flag, then
third-party shims would break when they see this new flag. To fix this,
I moved this new configuration option to an env var. We should use env
vars from here on out to avoid breaking shim compat.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-22 20:37:49 +00:00
Michael Crosby
1be6ee5396
Merge pull request #3555 from kevpar/ttrpc-address
...
Allow explicit configuration of TTRPC address
2019-08-22 14:37:56 -04:00
Wei Fu
8333d98c2b
Merge pull request #3571 from ethan-daocloud/typo-terminator
...
Cleanup: fix some typos in code comment
2019-08-22 23:33:50 +08:00
Michael Crosby
e963290458
Merge pull request #3562 from dmcgowan/update-release-1.3
...
Update 1.3 release notes and mailmap
2019-08-22 10:57:28 -04:00
Guangming Wang
89eae6429f
Cleanup: fix some typos in code comment
...
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-08-22 22:42:50 +08:00
Kevin Parsons
d7e1b25384
Allow explicit configuration of TTRPC address
...
Previously the TTRPC address was generated as "<GRPC address>.ttrpc".
This change now allows explicit configuration of the TTRPC address, with
the default still being the old format if no value is specified.
As part of this change, a new configuration section is added for TTRPC
listener options.
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-08-22 00:56:27 -07:00
Lantao Liu
03aafaa1cf
Update the integration test.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-21 16:31:29 -07:00
Lantao Liu
60f73b6cf1
Support simultaneous image unpack.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-21 16:31:29 -07:00
Phil Estes
bd46ea5191
Merge pull request #3570 from dmcgowan/fix-apply-trailing-data
...
Read trailing data on apply
2019-08-21 13:07:49 -07:00
Derek McGowan
550518ab84
Read trailing data on apply
...
This was removed by mistake during the direct unpack
PR refactoring.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-21 11:41:56 -07:00
Derek McGowan
348e9f7c35
Update release notes and mailmap
...
The beta period has ended, start preparing rc
release notes.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-21 10:46:04 -07:00
Akihiro Suda
4924bcb5fe
Merge pull request #3530 from jterry75/revenor_hcsshim
...
Revendor github.com/Microsoft/hcsshim
2019-08-21 16:55:42 +09:00
Phil Estes
8580926066
Merge pull request #3563 from Random-Liu/update-release-note
...
Update release note for CRI plugin for 1.3.
2019-08-20 19:48:27 -04:00
Lantao Liu
8acf5a142a
Update release note for CRI plugin for 1.3.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-20 15:06:33 -07:00
Justin Terry (VM)
041e9debb1
Revendor github.com/Microsoft/hcsshim
...
1. Revendors github.com/Microsoft/hcsshim to the latest known good commit.
This includes numerous bug fixes and improvements.
2. Vendors indirect dependency on go.opencensus.io since hcsshim now uses trace
correlation.
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-08-20 13:50:24 -07:00
Phil Estes
640860a042
Merge pull request #3559 from fuweid/avoid-read-config
...
runtime: only check killall for init process
2019-08-20 13:08:55 -04:00
Wei Fu
cd76c4120e
Merge pull request #3560 from keloyang/buffersize-32
...
Change bufferSize back to 32
2019-08-20 23:20:30 +08:00
Shukui Yang
21174cb497
Change bufferSize back to 32
...
Shim use non-blocking send now, there is no need to set bufferSize to 2048,
it's a waste.
Signed-off-by: Shukui Yang <keloyangsk@gmail.com>
2019-08-20 22:10:11 +08:00
Michael Crosby
08061c7c3c
Merge pull request #3540 from crosbymichael/shim-hang
...
Use non-blocking send and retry for exit events
2019-08-20 09:31:21 -04:00
Wei Fu
1073868e5e
runtime: only check killall for init process
...
When containerd-shim does reaper, the most processes are not init
process. Since json.Decode consumes more CPU resource, we should check
killall option for init process only.
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-08-20 19:18:34 +08:00
Derek McGowan
c6da899e2f
Merge pull request #3551 from crosbymichael/default-env
...
Remove the process default ENV
2019-08-19 14:04:39 -07:00
