Commit Graph

5305 Commits

Author SHA1 Message Date
Phil Estes
c58e1e20d6
Merge pull request #3725 from fuweid/me-use-runtime-version
version: use runtime.Version() directly
2019-10-07 13:54:28 -04:00
Michael Crosby
901bcb2231 Add distribution subpkgs to core
Ref: #3554

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-07 13:38:12 -04:00
Wei Fu
eaef634ef7 version: use runtime.Version() directly
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-10-07 22:45:26 +08:00
Michael Crosby
25947db049 Add support for spec generation with host devices
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-07 10:37:58 -04:00
Michael Crosby
8d0d1ebb63
Merge pull request #3716 from fahedouch/add_go_version_to_cli
adding go version to client description
2019-10-07 10:29:23 -04:00
Maksym Pavlenko
635dbf251a
Merge pull request #3720 from dmcgowan/fix-flaky-btrfs
Fix flaky btrfs test
2019-10-06 17:10:11 -07:00
Akihiro Suda
ea8cb3ac46
Merge pull request #3721 from thaJeztah/bump_runc_1.0.0-rc9
bump runc v1.0.0-rc9
2019-10-06 23:07:26 +09:00
fahed dorgaa
c0984941e3 adding go version to client description
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

gofmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add a Godoc

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

go fmt version.go

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>

add sapces to comment

Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
2019-10-06 13:38:51 +02:00
Sebastiaan van Stijn
fe947e83dc
bump runc v1.0.0-rc9
No code changes since the last vendor bump

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-06 00:02:29 +02:00
Derek McGowan
772032598a
Fix flaky btrfs test
Add logging and move the creation of the snapshotter inside
the attempt loop to catch cases where the mountinfo may
not be updated yet. When all attempts are reached there
is no reason to create the snapshotter as the unmount has
already occurred.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-04 17:51:45 -07:00
Michael Crosby
2a6d13b2ca
Merge pull request #3719 from mxpv/lease_opts
Make client's WithLease more flexible
2019-10-04 17:06:59 -04:00
Maksym Pavlenko
e4e7e554d5 Make client's WithLease more flexible.
It's sometimes useful to specify a custom lease configuration. In this
case clients have to deal with LeaseManager manually to create/defer delete lease (essentially dup
WithLease logic). This PR adds lease opts to WithLease, so options
can be specified inline.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-10-04 12:22:16 -07:00
Michael Crosby
38a0013c70
Merge pull request #3711 from Random-Liu/avoid-unnecessary-runc-state
Use cached state instead of `runc state`.
2019-10-04 15:05:11 -04:00
Lantao Liu
18be6e3714 Use cached state instead of runc state.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-03 10:53:13 -07:00
Michael Crosby
be6bead423
Merge pull request #3712 from estesp/add-completion-docs
Add more detail on releases to README
2019-10-03 13:22:04 -04:00
Phil Estes
4c2d740a2a
Merge pull request #3713 from crosbymichael/runc-bump2
Bump runc to 1b8a1eeec3f337ab5d94f28980
2019-10-03 12:01:21 -04:00
Michael Crosby
f277665edb Bump runc to 1b8a1eeec3f337ab5d94f28980
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-03 10:36:35 -04:00
Phil Estes
e33f70385b
Add more detail on releases
Add more detail to the README.md where releases are found and also add
the documentation for how to use the new auto-completion capabilities
provided by urfave and enabled in a recent PR.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-10-03 09:52:03 -04:00
Phil Estes
309c9c25ba
Merge pull request #3706 from mrueg/enable-autocmpl
ctr: Enable shell autocompletion
2019-10-03 09:15:51 -04:00
Phil Estes
a83ae30016
Merge pull request #3681 from crosbymichael/bump-cgroups
Update cri and cgroup packages
2019-10-01 11:38:23 -04:00
Michael Crosby
8ff5827e98 Update cri and cgroup packages
This change includes a cri master bump and a cgroup bump for windows support
with cgroup stats and reusing the cgroup metric types.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-01 10:19:56 -04:00
Phil Estes
1009023783
Merge pull request #3705 from dmcgowan/limit-travis-release
Limit travis release script to a single build
2019-10-01 08:24:48 -04:00
Manuel Rüger
b5fa55b0c2 ctr: Enable shell autocompletion
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
2019-10-01 09:43:21 +02:00
Derek McGowan
45ce735676
Limit travis release script to a single build
Prevent Travis from building and pushing up multiple times

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-30 14:35:56 -07:00
Phil Estes
7f9530d95b
Merge pull request #3703 from yuxiaobo96/containerd-my
fix-up :typo
2019-09-30 08:52:01 -04:00
yuxiaobo
0cb7e4d5fd Perfect documentations
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-30 09:29:04 +08:00
Wei Fu
36cf5b690d
Merge pull request #3689 from dmcgowan/release-1.3.0
Update release docs for 1.3.0
2019-09-27 09:04:35 +08:00
Derek McGowan
b172b7f9d7
Update release docs for 1.3.0
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-26 17:00:26 -07:00
Derek McGowan
a668365eca
Merge pull request #3696 from dmcgowan/fix-all-media-types
Fix all media types in Accept header to match RFC
2019-09-26 16:27:33 -07:00
Derek McGowan
524f81d06d
Merge pull request #3695 from Random-Liu/update-cri-release-1.3
Update cri to 5d49e7e51b43e36a6b9c4386257c7d08c602237f.
2019-09-26 15:22:18 -07:00
Derek McGowan
394db03f15
Fix all media types in Accept header to match RFC
Fixes the media type to align with Accept HTTP header
RFC which specifies glob syntax */*

See https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-26 14:48:42 -07:00
Lantao Liu
90735a5d13 Update cri to 5d49e7e51b43e36a6b9c4386257c7d08c602237f.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-26 14:31:00 -07:00
Michael Crosby
6624f622b2
Merge pull request #3692 from Random-Liu/cri-dependency-version
Get CRI dependency versions from containerd vendor.conf.
2019-09-26 16:56:14 -04:00
Lantao Liu
1b1b862eb3 Get CRI dependency versions from containerd vendor.conf.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-09-26 12:52:36 -07:00
Phil Estes
277ab9ed6e
Merge pull request #3686 from thaJeztah/bump_golang_1.12.10
AppVeyor: bump golang 1.12.10 (CVE-2019-16276)
2019-09-26 13:24:34 -04:00
Sebastiaan van Stijn
35d3bae1e1
AppVeyor: bump golang 1.12.10 (CVE-2019-16276)
full diff: https://github.com/golang/go/compare/go1.12.9...go1.12.10

```
Hi gophers,

We have just released Go 1.13.1 and Go 1.12.10 to address a recently reported security issue. We recommend that all affected users update to one of these releases (if you're not sure which, choose Go 1.13.1).

net/http (through net/textproto) used to accept and normalize invalid HTTP/1.1 headers with a space before the colon, in violation of RFC 7230. If a Go server is used behind an uncommon reverse proxy that accepts and forwards but doesn't normalize such invalid headers, the reverse proxy and the server can interpret the headers differently. This can lead to filter bypasses or request smuggling, the latter if requests from separate clients are multiplexed onto the same upstream connection by the proxy. Such invalid headers are now rejected by Go servers, and passed without normalization to Go client applications.

The issue is CVE-2019-16276 and Go issue golang.org/issue/34540.

Thanks to Andrew Stucki, Adam Scarr (99designs.com), and Jan Masarik (masarik.sh) for discovering and reporting this issue.

Downloads are available at https://golang.org/dl for all supported platforms.

Alla prossima,
Filippo on behalf of the Go team
```

From the patch: 6e6f4aaf70

```
net/textproto: don't normalize headers with spaces before the colon

RFC 7230 is clear about headers with a space before the colon, like

X-Answer : 42

being invalid, but we've been accepting and normalizing them for compatibility
purposes since CL 5690059 in 2012.

On the client side, this is harmless and indeed most browsers behave the same
to this day. On the server side, this becomes a security issue when the
behavior doesn't match that of a reverse proxy sitting in front of the server.

For example, if a WAF accepts them without normalizing them, it might be
possible to bypass its filters, because the Go server would interpret the
header differently. Worse, if the reverse proxy coalesces requests onto a
single HTTP/1.1 connection to a Go server, the understanding of the request
boundaries can get out of sync between them, allowing an attacker to tack an
arbitrary method and path onto a request by other clients, including
authentication headers unknown to the attacker.

This was recently presented at multiple security conferences:
https://portswigger.net/blog/http-desync-attacks-request-smuggling-reborn

net/http servers already reject header keys with invalid characters.
Simply stop normalizing extra spaces in net/textproto, let it return them
unchanged like it does for other invalid headers, and let net/http enforce
RFC 7230, which is HTTP specific. This loses us normalization on the client
side, but there's no right answer on the client side anyway, and hiding the
issue sounds worse than letting the application decide.
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-26 18:54:56 +02:00
Phil Estes
2a467650e2
Merge pull request #3684 from crosbymichael/bump-runc-cve
Bump runc for CVE-2019-16884
2019-09-26 11:36:43 -04:00
Michael Crosby
95dbbdc8c1 Bump runc for CVE-2019-16884
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-26 10:09:42 -04:00
Michael Crosby
4509efc303
Merge pull request #3683 from yuxiaobo96/containerd-update3
fix-up typo
2019-09-26 09:42:33 -04:00
yuxiaobo
62c2eea78d fix-up typo
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-26 13:02:03 +08:00
Derek McGowan
1c42610d98
Merge pull request #3680 from crosbymichael/btrfs-flake
Sync and stat btrfs loopback in tests
2019-09-25 13:47:31 -07:00
Michael Crosby
c5821baa41 Sync and stat btrfs loopback in tests
Fixes #3676

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-09-25 15:40:16 -04:00
Phil Estes
da66333271
Merge pull request #3677 from dmcgowan/gc-fix-notes
Add release note for gc fix
2019-09-25 08:29:36 -04:00
Phil Estes
c10e6a1029
Merge pull request #3679 from yuxiaobo96/containerd-update2
Perfect documentation
2019-09-25 08:28:49 -04:00
Phil Estes
4cd5de74bd
Merge pull request #3678 from yuxiaobo96/containerd-update
Word spelling correction
2019-09-25 08:27:24 -04:00
yuxiaobo
5ea9363624 Perfect documentation
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-25 16:59:31 +08:00
yuxiaobo
a0ae24b984 Word spelling correction
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
2019-09-25 16:49:54 +08:00
Derek McGowan
85eac2550f
Add release note for gc fix
Adds note for garbage collection fix related to removal
of leases, containers, and images.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-09-24 17:05:06 -07:00
Michael Crosby
aba201344e
Merge pull request #3675 from Random-Liu/update-cri-release-1.3
Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
2019-09-24 11:06:18 -04:00
Phil Estes
9c10bf89ba
Merge pull request #3668 from dmcgowan/fix-metadata-dirty
Update metadata interfaces for containers and leases
2019-09-24 09:38:27 -04:00