Commit Graph

11307 Commits

Author SHA1 Message Date
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
Mike Brown
f1d492b0cd
Merge pull request #1237 from Random-Liu/update-cni-plugins
Update cni plugins to v0.7.6.
2019-08-14 14:46:57 -05: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
Lantao Liu
cda752fd59 Update cni plugins to v0.7.6.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-14 10:19:42 -07:00
Lantao Liu
92603895fd
Merge pull request #1238 from crosbymichael/cni-update
Update cni and go-cni to the v0.7.1 release
2019-08-14 10:18:29 -07:00
Michael Crosby
3995efc7c1 Update cni and go-cni to the v0.7.1 release
Closes #1236

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-14 16:19:37 +00:00
Sebastiaan van Stijn
1b389b3628
AppVeyor: update to go 1.12.8 (CVE-2019-9512, CVE-2019-9514)
go1.12.8 (released 2019/08/13) includes security fixes to the net/http and net/url packages.
See the Go 1.12.8 milestone on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.12.8

- net/http: Denial of Service vulnerabilities in the HTTP/2 implementation
  net/http and golang.org/x/net/http2 servers that accept direct connections from untrusted
  clients could be remotely made to allocate an unlimited amount of memory, until the program
  crashes. Servers will now close connections if the send queue accumulates too many control
  messages.
  The issues are CVE-2019-9512 and CVE-2019-9514, and Go issue golang.org/issue/33606.
  Thanks to Jonathan Looney from Netflix for discovering and reporting these issues.
  This is also fixed in version v0.0.0-20190813141303-74dc4d7220e7 of golang.org/x/net/http2.
  net/url: parsing validation issue
- url.Parse would accept URLs with malformed hosts, such that the Host field could have arbitrary
  suffixes that would appear in neither Hostname() nor Port(), allowing authorization bypasses
  in certain applications. Note that URLs with invalid, not numeric ports will now return an error
  from url.Parse.
  The issue is CVE-2019-14809 and Go issue golang.org/issue/29098.
  Thanks to Julian Hector and Nikolai Krein from Cure53, and Adi Cohen (adico.me) for discovering
  and reporting this issue.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-14 18:12:51 +02:00
Lantao Liu
5ea371c689
Merge pull request #1235 from Random-Liu/wildcard-mirror
Add wildcard mirror support.
2019-08-13 13:04:48 -07:00
Lantao Liu
81ca274c6f Add wildcard mirror support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-13 12:02:57 -07:00
Michael Crosby
2e8ea9fd6b Allow timeouts to be configured in config
This adds a singleton `timeout` package that will allow services and user
to configure timeouts in the daemon.  When a service wants to use a
timeout, it should declare a const and register it's default value
inside an `init()` function for that package.  When the default config
is generated, we can use the `timeout` package to provide the available
timeout keys so that a user knows that they can configure.

These show up in the config as follows:

```toml
[timeouts]
  "io.containerd.timeout.shim.cleanup" = 5
  "io.containerd.timeout.shim.load" = 5
  "io.containerd.timeout.shim.shutdown" = 3
  "io.containerd.timeout.task.state" = 2

```

Timeouts in the config are specified in seconds.

Timeouts are very hard to get right and giving this power to the user to
configure things is a huge improvement.  Machines can be faster and
slower and depending on the CPU or load of the machine, a timeout may
need to be adjusted.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-13 17:36:32 +00:00
Phil Estes
b77e25dade
Merge pull request #3516 from crosbymichael/remote-enc
Remove encryption code from containerd core
2019-08-13 10:52:48 -04:00
Phil Estes
95277fa447
Merge pull request #3524 from ethan-daocloud/patch-2
blkio.go: correct help message word spells.
2019-08-13 10:51:36 -04:00
ethan
a80db38c33 blkio.go: correct help message word spells.
Signed-off-by: Guangming Wang <guangming.wang@daocloud.io>
2019-08-13 09:41:25 +08:00
Phil Estes
ec0c968215
Merge pull request #3520 from dmcgowan/image-usage
Add image usage function to client
2019-08-12 18:01:15 -04:00
Michael Crosby
f6504149e5
Merge pull request #3519 from thaJeztah/bump_boltdb
bump go.etcd.io/bbolt v1.3.3
2019-08-12 13:53:51 -04:00
Michael Crosby
cdc58b7976
Merge pull request #3526 from carlosedp/riscv64
bump x/sys to fix riscv64 epoll
2019-08-12 12:01:30 -04:00
Phil Estes
e64ce76b13
Merge pull request #3523 from thaJeztah/bump_golang
AppVeyor: update to go 1.12.7
2019-08-12 11:24:33 -04:00
CarlosEDP
3ef26cd87c bump x/sys to fix riscv64 epoll
Signed-off-by: CarlosEDP <me@carlosedp.com>
2019-08-12 11:43:53 -03:00
Sebastiaan van Stijn
2ff7183cc2
AppVeyor: update to go 1.12.7
Use the latest Go release for testing on AppVeyor

> go1.12.7 (released 2019/07/08) includes fixes to cgo, the compiler,
> and the linker. See the Go 1.12.7 milestone on our issue tracker for details:
>
> https://github.com/golang/go/issues?q=milestone%3AGo1.12.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-12 09:57:02 +02:00
Lantao Liu
8021850e91
Merge pull request #1233 from AkihiroSuda/allow-ca-without-client-certs
allow non-mutual TLS
2019-08-11 17:07:57 -07:00
Lantao Liu
a4b145adbb
Merge pull request #1234 from Random-Liu/update-containerd-to-fix-race
Update containerd to fix panic caused by race condition.
2019-08-11 16:51:56 -07:00
Lantao Liu
7f330dc4aa Update containerd to fix panic caused by race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-10 10:40:43 -07:00
Lantao Liu
fd6c732cd7
Merge pull request #1232 from Random-Liu/avoid-schema1-roundtrip
Remove extra roundtrip for checking schema1.
2019-08-10 10:25:46 -07:00
Lantao Liu
f1fbdbfab7
Merge pull request #1231 from Random-Liu/consider-endpoint-path-for-default
Consider endpoint path when checking default host.
2019-08-10 10:23:49 -07:00
Akihiro Suda
28e492fce0 allow non-mutual TLS
Previously, client keypair had needed to be specified even when unused.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-08-10 21:48:03 +09:00
Lantao Liu
d64fa3b6b8 Remove extra roundtrip for checking schema1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-09 18:47:40 -07:00
Lantao Liu
005f9f7378 Consider endpoint path when checking default host.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-09 18:22:08 -07:00
Lantao Liu
a7481289bb
Merge pull request #1227 from Random-Liu/new-registry-mirror
New registry mirror
2019-08-09 16:24:38 -07:00
Derek McGowan
c017e0efed
Use a child context for errgroup in dispatch
Prevent an errgroup error from causing the acquire to
return a cancellation error. Previously any error
from the errgroup would cause the Dispatch to always
return the cancelled error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-09 16:01:23 -07:00