github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
5,213 Commits 3 Branches 2 Tags 112 MiB
da66333271
Commit Graph

5213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
a1e3779cad Support config imports #3289 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-08-22 15:50:58 -07:00
Maksym Pavlenko
6e2228df72 Vendor github.com/imdario/mergo 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2019-08-22 15:41:50 -07: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
Phil Estes
c537c8968c
Merge pull request #3550 from kevpar/remove-eventlog 
Remove Windows EventLog logging hook
 2019-08-19 15:04:42 -04:00
Kevin Parsons
64a0b2eb26 Revendor to remove unused dependencies 
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-08-19 11:23:34 -07:00
Michael Crosby
7379fa6631 Remove the process default ENV 
With the change in #3542 it breaks $PATH handling for images becuase our
default spec always sets a PATH on the process's .Env.

This removes the default and adds an Opt to add this back.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-19 18:18:58 +00:00
Kevin Parsons
5023d96ad2 Remove Windows EventLog logging hook 
EventLog is very old and provides a poor experience. We have supported
ETW for logging for a while, which is much better. We have also
observed an issue where EventLog keeps containerd.exe open, preventing
containerd from being upgraded to a new version. Due to all of this,
it makes sense to remove the old EventLog hook in favor of using ETW
logging on Windows as the primary diagnostic experience.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
 2019-08-19 10:24:37 -07:00
Phil Estes
fc9335d75c
Merge pull request #3459 from crosbymichael/timeout-config 
Allow timeouts to be configured in config
 2019-08-19 13:16:43 -04:00
Michael Crosby
6cb56bb605
Merge pull request #3536 from darfux/ignore_closed_fifo_error_under_multi_cntr 
Ignore fifo error when using v2 multi-container shim
 2019-08-19 11:06:56 -04:00
Michael Crosby
0ab7f03fee
Merge pull request #3528 from dmcgowan/overlay-direct-unpack 
Add direct unpack support for overlay
 2019-08-19 10:26:48 -04:00
Michael Crosby
2763639388 Try to preserve exit event order 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-19 14:23:12 +00:00
Akihiro Suda
eac100ac97
Merge pull request #3548 from Random-Liu/update-cri 
Update cri to f1d492b0cd.
 2019-08-19 13:53:26 +09:00
Li Yuxuan
04caf1fc4e Ignore fifo error when using v2 multi-container shim 
When using a multi-container shim, the fifo of the 2nd to Nth container
will not be opened when the ctx is done. This will cause an
`ErrReadClosed` that can be ignored.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
 2019-08-17 09:40:08 +08:00
Lantao Liu
9cbd18ac76 Update cri to f1d492b0cd. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-16 16:38:22 -07:00
Derek McGowan
bcc4a146e4
Support applying with parent directories 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-08-16 15:49:47 -07:00
Derek McGowan
5a0ff41c81
Update continuity vendor 
Pulls in copy and fstest changes

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-08-16 15:49:47 -07:00
Michael Crosby
c62b7444ef
Merge pull request #3545 from estesp/update-fifo 
Update fifo vendoring for typed errors
 2019-08-16 15:43:06 -04:00
Phil Estes
80d31d15ba
Update fifo for typed errors 
Update containerd/fifo vendor.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-08-16 14:29:32 -04:00
Michael Crosby
666cfe11cb
Merge pull request #3547 from ethan-daocloud/patch-3 
cleanup code typos in leases.go
 2019-08-16 12:52:41 -04:00
Guangming Wang
6d0e355c6d
cleanup code typos in leases.go 
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
 2019-08-17 00:27:08 +08:00
Phil Estes
60439aeb17
Merge pull request #3542 from 1032120121/upstream_master 
bugfix: override image.Env with process.Env, rather than be contrary
 2019-08-16 10:15:32 -04:00
Michael Crosby
bee4c1a8a2 Add retry and non-blocking send for exit events 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-16 13:55:05 +00:00
Michael Crosby
0d27d8f4f2 Unifi reaper logic into package 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-08-16 13:55:05 +00:00
Shukui Yang
bb4c92c773 Fix shim hung 
shim.Reap and shim.Default.Wait may deadlock, use Monitor.Notify
to fix this issue.

Signed-off-by: Shukui Yang <keloyangsk@gmail.com>
 2019-08-16 13:55:05 +00:00
Phil Estes
e07359b761
Merge pull request #3541 from tao12345666333/bump-go-1.12.9 
AppVeyor: update to go 1.12.9
 2019-08-16 08:20:03 -04:00
Yangyang
1c30d4d04c bugfix: override image.Env with process.Env, rather than be contrary 
Signed-off-by: Yangyang <1032120121@163.com>
 2019-08-16 18:53:07 +08:00
Jintao Zhang
7682acb9e7 AppVeyor: update to go 1.12.9 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2019-08-16 10:27:38 +08:00
Lantao Liu
81386df917
Add direct unpack support for overlay and aufs 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-08-15 12:09:32 -07:00
Michael Crosby
074b75907b
Merge pull request #3531 from thaJeztah/bump_golang_1.12.8 
AppVeyor: update to go 1.12.8 (CVE-2019-9512, CVE-2019-9514)
 2019-08-14 13:24:37 -04:00