Commit Graph

5909 Commits

Author SHA1 Message Date
Derek McGowan
724d0eb859
Merge pull request #4039 from AkihiroSuda/no-zfs
support building with BUILDTAGS="no_zfs no_aufs"
2020-02-18 11:39:38 -08:00
Akihiro Suda
8e685f78cf support building with BUILDTAGS="no_zfs no_aufs"
These plugins do not always need to be built-in.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-19 01:52:03 +09:00
Phil Estes
3fe22817ab
Merge pull request #4037 from thaJeztah/update_mailmap
Update mailmap
2020-02-18 09:38:56 -05:00
Sebastiaan van Stijn
61596169bb
Update .mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-18 10:24:08 +01:00
Sebastiaan van Stijn
f44d360992
Update .mailmap with changes from release-branches
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-18 09:33:42 +01:00
Akihiro Suda
04cda9b400
Merge pull request #4032 from thaJeztah/bump_golang_1.13.8
Update Golang 1.13.8
2020-02-18 02:43:22 +09:00
Sebastiaan van Stijn
499ab8a99a
Update Golang 1.13.8
full diff: https://github.com/golang/go/compare/go1.13.7...go1.13.8

go1.13.8 (released 2020/02/12) includes fixes to the runtime, the crypto/x509,
and net/http packages. See the Go 1.13.8 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-17 17:18:25 +01:00
Phil Estes
48d998f52c
Merge pull request #4034 from fuweid/me-use-current-git-for-critools
script: use github.com/kubernetes-sigs/cri-tools directly
2020-02-17 10:12:37 -05:00
Wei Fu
246a560edb script: use github.com/kubernetes-sigs/cri-tools directly
When we call `go get -d -v
github.com/kubernetes-incubator/cri-tools/...` which repos has been
moved to `github.com/kubernetes-sigs/cri-tools`, `go get` will create
package `github.com/kubernetes-sigs/cri-tools`.

```
go get -d -v github.com/kubernetes-incubator/cri-tools/...
github.com/kubernetes-incubator/cri-tools (download)
github.com/kubernetes-sigs/cri-tools (download)
```

According to old version of `github.com/kubernetes-incubator/cri-tools`
Makefile, if there is no `github.com/kubernetes-sigs/cri-tools` package,
it will create softlink self to `github.com/kubernetes-sigs/cri-tools`.
But `go get` will create `github.com/kubernetes-sigs/cri-tools` and
there is no softlink. Therefore, the critools are always latest one, not
specific version.

So, use `github.com/kubernetes-sigs/cri-tools` will be better and save
traffic from `go get`.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-02-17 21:52:39 +08:00
Maksym Pavlenko
27f25069c0
Merge pull request #4013 from estesp/support-32bit-arm64
Support 32-bit userspace on 64-bit ARM cores
2020-02-14 11:48:05 -08:00
Phil Estes
7811aa7552
Merge pull request #4022 from estesp/fix-script-comment
Fix incorrect comment from copy/paste of starting script
2020-02-13 14:22:59 -08:00
Phil Estes
75d0c5f2e7
Fix incorrect comment from copy/paste of starting script
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-02-13 11:48:12 -05:00
Wei Fu
e74962eaa6
Merge pull request #4018 from estesp/update-readme
Fix reference to LICENSE in README.md
2020-02-13 23:00:01 +08:00
Phil Estes
0dd6d24d2a
Fix reference to LICENSE in README.md
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-02-13 00:10:49 -05:00
Phil Estes
89de113de9
Support 32-bit userspace on 64-bit ARM cores
Don't rely on /proc/cpuinfo denoting a 64-bit ARMv8 processor if the
runtime detected GOARCH == arm. This allows aarch64 32-bit userspace
distros to run containers properly via a 32-bit runtime.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-02-13 00:10:01 -05:00
Phil Estes
5abacb62da
Merge pull request #4017 from bloodorangeio/octet-stream-fix
Set octet-stream content-type on put request
2020-02-12 10:51:30 -08:00
Josh Dolitsky
d8a0d29c23 Set octet-stream content-type on put request
Signed-off-by: Josh Dolitsky <393494+jdolitsky@users.noreply.github.com>
2020-02-12 11:39:33 -06:00
Derek McGowan
cbf3ee0e22
Merge pull request #4010 from zhsj/fix-zsh-complete
Fix zsh autocomplete script
2020-02-11 10:39:04 -08:00
Shengjing Zhu
348e683ceb Fix zsh autocomplete script
Fix completion when argument startswith `-`
Merged in upstream https://github.com/urfave/cli/pull/1062

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-02-11 19:56:27 +08:00
Phil Estes
4f348c5b5b
Merge pull request #3999 from thaJeztah/bump_cri
vendor: bump cri, gopkg.in/yaml.v2 v2.2.8
2020-02-04 14:45:20 +01:00
Sebastiaan van Stijn
263ab70146
vendor: bump gopkg.in/yaml.v2 v2.2.8
full diff: https://github.com/go-yaml/yaml/compare/v2.2.4...v2.2.8

includes:

- go-yaml/yaml@f90ceb4 Fix check for non-map alias merging in v2
    - fix for "yaml.Unmarshal crashes on "assignment to entry in nil map""
- go-yaml/yaml 543 Port stale simple_keys fix to v2
- go-yaml/yaml@1f64d61 Fix issue in simple_keys improvements
    - fixes "Invalid simple_keys now cause panics later in decode"
- go-yaml/yaml 555 Optimize cases with long potential simple_keys

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-04 09:34:14 +01:00
Sebastiaan van Stijn
4c38278895
vendor: update containerd/cri c0294ebfe0
full diff: 19589b4bf9...c0294ebfe0

- containerd/cri#1387 vendor: bump gopkg.in/yaml.v2 v2.2.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-04 09:32:09 +01:00
Maksym Pavlenko
f5d8ff57c8
Merge pull request #3965 from jterry75/wcow_lcow_scratch_size
Add support for custom wcow and lcow sandbox scratch sizes
2020-01-30 22:34:35 -08:00
Derek McGowan
46d1fb2fdc
Merge pull request #3992 from mxpv/losetup
Make losetup tests less flaky
2020-01-30 12:22:33 -08:00
Derek McGowan
12cb1554be
Merge pull request #3972 from fuweid/me-fix-3937
Pull: create image record after blobs download
2020-01-30 10:56:59 -08:00
Maksym Pavlenko
f0652e1434 Make tests less flaky
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-01-30 09:57:34 -08:00
Justin Terry (VM)
bb8af922bb Add support for custom wcow and lcow sandbox scratch sizes
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2020-01-30 07:27:06 -08:00
Phil Estes
431cfd86e7
Merge pull request #3991 from mihaicmn/fix-default-config
Fix startup_delay within default configuration
2020-01-30 11:42:40 +02:00
Mihai Coman
5e6d56ee2d Fix startup_delay within default configuration
Without this patch, the containerd daemon fails to start using the
default configuration example:
containerd[37139]: containerd: time: missing unit in duration 100000000

Signed-off-by: Mihai Coman <mihai.cmn@gmail.com>
2020-01-29 15:34:23 +02:00
Phil Estes
07de4eccf1
Merge pull request #3983 from AkihiroSuda/ctr-events-ignore-err
ctr events: do not exit on an error
2020-01-29 15:05:48 +02:00
Phil Estes
a07cb9d0c4
Merge pull request #3987 from thaJeztah/bump_golang_1.13.7
Update Golang 1.13.7, x/crypto (CVE-2020-0601, CVE-2020-7919)
2020-01-29 10:35:45 +02:00
Akihiro Suda
833701165a ctr events: do not exit on an error
Errors like `"type with url %s: not found"` are typical for non-builtin
event types, and should not resultin exiting `ctr`.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-01-29 13:10:16 +09:00
Sebastiaan van Stijn
2002411638
vendor: update golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
full diff: 60c769a6c5...69ecbb4d6d

Includes 69ecbb4d6d
(forward-port of 8b5121be2f),
to address CVE-2020-7919:

Panic in crypto/x509 certificate parsing and golang.org/x/crypto/cryptobyte
On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1 parsing
functions of golang.org/x/crypto/cryptobyte can lead to a panic.
The malformed certificate can be delivered via a crypto/tls connection to a
client, or to a server that accepts client certificates. net/http clients can
be made to crash by an HTTPS server, while net/http servers that accept client
certificates will recover the panic and are unaffected.
Thanks to Project Wycheproof for providing the test cases that led to the
discovery of this issue. The issue is CVE-2020-7919 and Go issue golang.org/issue/36837.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 18:46:31 +01:00
Sebastiaan van Stijn
32ba75f0fb
Update Golang 1.13.7 (CVE-2020-0601, CVE-2020-7919)
full diff: https://github.com/golang/go/compare/go1.13.6...go1.13.7

go1.13.7 (released 2020/01/28) includes two security fixes. One mitigates
the CVE-2020-0601 certificate verification bypass on Windows. The other affects
only 32-bit architectures.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.7+label%3ACherryPickApproved

- X.509 certificate validation bypass on Windows 10
  A Windows vulnerability allows attackers to spoof valid certificate chains when
  the system root store is in use. These releases include a mitigation for Go
  applications, but it’s strongly recommended that affected users install the
  Windows security update to protect their system.
  This issue is CVE-2020-0601 and Go issue golang.org/issue/36834.
- Panic in crypto/x509 certificate parsing and golang.org/x/crypto/cryptobyte
  On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1 parsing
  functions of golang.org/x/crypto/cryptobyte can lead to a panic.
  The malformed certificate can be delivered via a crypto/tls connection to a
  client, or to a server that accepts client certificates. net/http clients can
  be made to crash by an HTTPS server, while net/http servers that accept client
  certificates will recover the panic and are unaffected.
  Thanks to Project Wycheproof for providing the test cases that led to the
  discovery of this issue. The issue is CVE-2020-7919 and Go issue golang.org/issue/36837.
  This is also fixed in version v0.0.0-20200124225646-8b5121be2f68 of golang.org/x/crypto/cryptobyte.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 18:35:49 +01:00
Akihiro Suda
d3b42574a7
Merge pull request #3986 from thaJeztah/fix_release_tool_link
Fix broken link to release-tool
2020-01-29 01:06:57 +09:00
Akihiro Suda
09944e714f
Merge pull request #3985 from thaJeztah/bump_versions
RELEASES.md update links to latest v1.2.11 and v1.3.2
2020-01-29 01:06:41 +09:00
Sebastiaan van Stijn
e42110f326
Fix broken link to release-tool
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 14:57:31 +01:00
Sebastiaan van Stijn
e2e07c9bc1
RELEASES.md update links to latest v1.2.11 and v1.3.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 14:53:07 +01:00
Phil Estes
a1e0303e7a
Merge pull request #3978 from dims/sync-with-latest-containerd-cri-master-including-selinux-change
Sync with latest changes in containerd/cri
2020-01-25 23:41:13 +02:00
Davanum Srinivas
0dc69620b8
update dependencies of containerd/cri
List generated by running:
`git diff c9d45e6526 19589b4bf9 vendor.conf`

in the containerd/cri repositoru

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-25 14:20:17 -05:00
Davanum Srinivas
53ced5ffe1
update to latest containerd/cri (master)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-25 14:20:11 -05:00
Davanum Srinivas
faf03c3d23
Pick up fix for CVE-2019-16884 in opencontainers/selinux
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-25 14:19:59 -05:00
Phil Estes
5c72f92a5d
Merge pull request #3973 from dims/update-to-new-rc10-of-opencontainers/runc
Bump to opencontainers/runc new version - v1.0.0-rc10
2020-01-25 06:58:34 +02:00
Davanum Srinivas
923c05bed1
Bump to opencontainers/runc new version - v1.0.0-rc10
We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-19921 as well. The full
diff upstream is here:
https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-24 10:13:56 -05:00
Phil Estes
c2ad9dc12d
Merge pull request #3970 from TBBle/windows_build_without_cgo
Revendor hcsshim to remove CGO requirement from Windows build
2020-01-22 18:38:09 +02:00
Paul "TBBle" Hampson
e44d008659 Appveyor on_success field should be an array.
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-22 21:29:52 +11:00
Paul "TBBle" Hampson
a224937d2c Disable CGO for AppVeyor build steps
CGO is explicitly enabled for the test steps, as `-race` is passed to
`go test`, which depends on CGO to function.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-22 21:29:52 +11:00
Wei Fu
75af17946d Pull: create image record after blobs download
When pull image with unpack option, the fetch action will defer blobs
download until unpack. If create image record in ImageService before
blobs download, the following requests to use image will fail because
there is still missing blobs download.

In order to fix concurrent issue, need to create image record after
blobs download.

Fix: #3937

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-01-20 18:26:14 +08:00
Paul "TBBle" Hampson
45a17cffb6 Vendor Microsoft/hcsshim with CGO removal
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-01-19 06:07:10 +11:00
Akihiro Suda
592a617f3d
Merge pull request #3969 from thaJeztah/bump_golang_1.13.6
Update Golang 1.13.6
2020-01-18 02:43:26 +09:00