Commit Graph

5531 Commits

Author SHA1 Message Date
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
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
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
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
Derek McGowan
75771c4634
Add usage function to client
The usage function allows more configurable and accurate calculations
of the usage for an image.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-09 15:46:22 -07:00
Sebastiaan van Stijn
b6fca48fed
bump go.etcd.io/bbolt v1.3.3
this brings the dependency back to a released version:

- go.etcd.io/bbolt 2eb7227ade...v1.3.3
  - etcd-io/bbolt#153 fix rollback panic bug
    - fixes etcd-io/bbolt#152 Panic (index out of range) on writeable tx rollback with db.NoFreelistSync

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-09 22:56:54 +02:00
Michael Crosby
ea13c9fe99
Merge pull request #3518 from crosbymichael/processors
Add docs for stream processors
2019-08-09 15:07:15 -04:00
Michael Crosby
0dadef19cf Add docs for stream processors
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-09 18:40:43 +00:00
Michael Crosby
d085d9b464 Remove encryption code from containerd core
We are separating out the encryption code and have designed a few new
interfaces and APIs for processing content streams.  This keep the core
clean of encryption code but enables not only encryption but support of
multiple content types ( custom media types ).

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-09 15:01:16 +00:00
Michael Crosby
f06e605f1a
Merge pull request #3515 from fuweid/me-remove-comment-line
remotes: remove useless line
2019-08-09 09:21:36 -04:00
Phil Estes
ec4ad5332d
Merge pull request #3506 from darfux/copy_md_when_set_ttrpcheader
namespace: Copy ttrpc metadata before setting header
2019-08-09 08:22:17 -04:00
Phil Estes
c0cf9a5905
Merge pull request #3509 from dmcgowan/update-1.3-beta-notes
Add release notes for stream processor
2019-08-09 08:20:35 -04:00
Wei Fu
282b19efd2 remotes: remove useless line
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-08-09 17:15:09 +08:00
Li Yuxuan
a3a30635ef namespace: Copy ttrpc metadata before setting header
If there are multiple goroutines calling `namespace.WithNamespace` on a
ctx that already had namespace, there will be a data race when
`withTTRPCNamespaceHeader` calling `MD.Set()`. So we have to copy the md
before using it.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2019-08-09 13:16:29 +08:00
Wei Fu
a1c88e195a
Merge pull request #3484 from rancher/master
Limit multiple platform manifests to one for size check
2019-08-09 10:09:50 +08:00
Phil Estes
b4dce14ac0
Merge pull request #3510 from dmcgowan/remove-ppc64le
Remove ppc64le from travis
2019-08-08 21:07:49 -04:00
Derek McGowan
04b7f1b594
Remove ppc64le from travis
The tests run too slow and flaky. Once the flakiness and
speed are addressed we can re-enable.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-08 16:11:17 -07:00
Derek McGowan
2fac3ee27d
Add release notes for stream processor
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-08-08 14:43:34 -07:00
Darren Shepherd
1161409779 Limit multiple platform manifests to one for size check
client.Pull will only pull one matching platform by default.
When checking the size of image we match that behavior so that
we don't look for multiple platforms that might not exist on disk.

Signed-off-by: Darren Shepherd <darren@rancher.com>
2019-08-08 14:16:27 -07:00
Michael Crosby
23faecfb66
Merge pull request #3505 from crosbymichael/remoteopts-unpack
Add UnpackOpts to RemoteContext
2019-08-08 13:20:34 -04:00
Michael Crosby
fe3638e887 Add UnpackOpts to RemoteContext
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-08 15:42:51 +00:00
Michael Crosby
1eb13fc2f0
Merge pull request #3501 from wanghuaiqing2010/master
cast Rdev of Stat_t to uint64 for mips
2019-08-08 10:27:52 -04:00
wanghuaiqing
d8322e38c7 cast Rdev of Stat_t to uint64 for mips
Signed-off-by: wanghuaiqing <wanghuaiqing@loongson.cn>
2019-08-08 14:24:50 +08:00
Michael Crosby
5222236c1b
Merge pull request #3502 from estesp/clarify-ctr
Clarify text on `ctr` support/inclusion
2019-08-07 16:27:41 -04:00