Commit Graph

8706 Commits

Author SHA1 Message Date
Phil Estes
b6bb481800
Merge pull request #4794 from kzys/lock-since
content: include the staleness of the lock when tryLock() fails
2020-12-04 13:46:21 -05:00
Vlad Ungureanu
f12b68cc86 Allow configuration of different log formats: text, json
Signed-off-by: Vlad Ungureanu <vladu@palantir.com>
2020-12-04 13:12:41 -05:00
Wei Fu
cb8253eea3
Merge pull request #4791 from crosbymichael/base-runtime-opts
[cri] don't clear base security settings
2020-12-04 14:25:00 +08:00
Wei Fu
59a0667cff
Merge pull request #4799 from jiazhiguang/master
Add the Inclavare-Containers container runtime to the adopters list
2020-12-03 18:02:44 +08:00
jiazhiguang
0f041dc1ba ADOPTERS.md: Add the Inclavare-Containers container runtime
Inclavare Containers is an innovation of container runtime with the
novel approach for launching protected containers in hardware-assisted
Trusted Execution Environment (TEE) technology, aka Enclave, which can
prevent the untrusted entity, such as Cloud Service Provider (CSP), from
accessing the sensitive and confidential assets in use.

Signed-off-by: Zhiguang Jia <jia_zhiguang@126.com>
2020-12-03 17:02:43 +08:00
Kazuyoshi Kato
c95d71cf60 content: include the staleness of the lock when tryLock() fails
When multiple clients are pulling the same image, we may have this
lock error. Short-lived locks are probably fine, but long-lived locks
may indicate that containerd has some issues.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-12-02 14:08:02 -08:00
Maksym Pavlenko
9561d9389d
Merge pull request #4776 from didier-durand/README_typo
Fixing 1 typo in README
2020-12-02 11:55:22 -08:00
Paul "TBBle" Hampson
78f31afb45 Reorder to separate generic from windows-specific code
Specifically, all the functions above applyWindowsLayer are actually
used by the (generic) applyNaive code, while the functions below this
point are specific to applyWindowsLayer.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-12-03 02:43:37 +11:00
Paul "TBBle" Hampson
3e47cdf70f Use go-winio tar-application code instead of our own
applyFunc now takes an io.Reader instead of a tar.Reader because I'm
trying to mirror the API of the not-yet-exposed implementation of this
same behaviour in github.com/Microsoft/hcsshim/internal/ociwclayer,
with an eye to later moving to that implementation it is ever exposed.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-12-03 02:42:54 +11:00
Paul "TBBle" Hampson
05647251a5 Update microsoft/go-winio to v0.4.15
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-12-03 02:40:33 +11:00
Michael Crosby
3d358c9df3 [cri] don't clear base security settings
When a base runtime spec is being used, admins can configure defaults for the
spec so that default ulimits or other security related settings get applied for
all containers launched.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-12-02 06:51:37 -05:00
Akihiro Suda
7126310a09
Merge pull request #4784 from fuweid/fix-4769
runtime: should not send duplicate task exit event
2020-12-02 15:26:57 +09:00
Phil Estes
774cb16a44
Merge pull request #4739 from kzys/handle-scheme
Handle an image ref with scheme
2020-12-01 14:37:16 -05:00
Phil Estes
fbf1a72de7
Merge pull request #4760 from zhsj/gomod
Move to Go modules
2020-12-01 14:36:08 -05:00
Michael Crosby
b9092fae15
Merge pull request #4643 from dcantah/feedback-lcow-snapshotter
Optimize Windows and LCOW snapshotters to only create scratch layer on the final snapshot
2020-12-01 10:38:02 -05:00
Wei Fu
faec5d4ffd runtime: should not send duplicate task exit event
If the shim has been killed and ttrpc connection has been
closed, the shimErr will not be nil. For this case, the event
subscriber, like moby/moby, might have received the exit or delete
events. Just in case, we should allow ttrpc-callback-on-close to
send the exit and delete events again. And the exit status will
depend on result of shimV2.Delete.

If not, the shim has been delivered the exit and delete events.
So we should remove the task record and prevent duplicate events from
ttrpc-callback-on-close.

Fix: #4769

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-12-01 21:54:04 +08:00
Daniel Canter
a91c298d1d Optimize Windows and LCOW snapshotters to only create scratch layer on the final snapshot
For LCOW currently we copy (or create) the scratch.vhdx for every single snapshot
so there ends up being a sandbox.vhdx in every directory seemingly unnecessarily. With the default scratch
size of 20GB the size on disk is about 17MB so there's a 17MB overhead per layer plus the time to copy the
file with every snapshot. Only the final sandbox.vhdx is actually used so this would be a nice little
optimization.

For WCOW we essentially do the exact same except copy the blank vhdx from the base layer.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2020-11-30 16:25:38 -08:00
Derek McGowan
4a4bb851f5
Merge pull request from GHSA-36xw-fx78-c5r4
Use path based unix socket for shims
2020-11-30 10:32:18 -08:00
Shengjing Zhu
7e46676e7c Go mod vendor
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:41:25 +08:00
Shengjing Zhu
fc946ca82a Revert urfave/cli version bump
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:41:25 +08:00
Shengjing Zhu
c129310ece Don't fail fast in integration matrix test
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:39:10 +08:00
Shengjing Zhu
56eca84ae8 Remove reference of GO111MODULE=off
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:39:10 +08:00
Shengjing Zhu
56672b961d Change to GOPATH before go get
So it won't touch go.mod

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:39:10 +08:00
Shengjing Zhu
819ac05f34 Fix hcsshim commit detection
Hack with space in grep, so it won't match github.com/Microsoft/hcsshim/test

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:34:14 +08:00
Shengjing Zhu
553a369158 Fix reference to vendor.conf in scripts
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:34:10 +08:00
Shengjing Zhu
089d2183bf Replace vndr in Makefile
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:33:56 +08:00
Shengjing Zhu
6a2df5fcec Revert gogo/googleapis version bump
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:33:56 +08:00
Shengjing Zhu
de059b11ba Revert protobuf and grpc version bump
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:33:56 +08:00
Shengjing Zhu
89a1fea392 Go mod tidy
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:33:56 +08:00
Shengjing Zhu
9aafdbdb4e Convert vendor.conf to go.mod with go mod init
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-12-01 01:33:56 +08:00
Phil Estes
7ccd0646e4
Merge pull request #4781 from ekrecker/patch-2
Fix some typos and grammars
2020-11-30 11:50:10 -05:00
Michael Crosby
aa2c930a3e
Merge pull request #4778 from AkihiroSuda/remove-unused-hack-utils.sh
remove unused hack/utils.sh
2020-11-30 11:09:27 -05:00
Michael Crosby
3b54a06ee3
Merge pull request #4779 from AkihiroSuda/fedora33
Vagrantfile: update to Fedora 33
2020-11-30 11:08:47 -05:00
Michael Crosby
e58adfd71b
Merge pull request #4777 from AkihiroSuda/crun-016
CI: update crun to 0.16
2020-11-30 11:07:27 -05:00
kwgchi
b69f36aa13 Fix some typos and grammars
Signed-off-by: ekrecker <eiichi.kendoruki@gmail.com>
2020-11-30 22:53:43 +09:00
Akihiro Suda
602b2c666f
remove unused hack/utils.sh
Nothing in `hack/utils.sh` was actually used, except `$ROOT` variable

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-11-30 19:29:49 +09:00
Akihiro Suda
efc4d9909a
Vagrantfile: update to Fedora 33
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-11-30 19:12:49 +09:00
Akihiro Suda
a67dbdee79
CI: update crun to 0.16
Changes since 0.15:
- https://github.com/containers/crun/releases/tag/0.16
- https://github.com/containers/crun/releases/tag/0.15.1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-11-30 18:10:24 +09:00
Didier Durand
75a03e4ce5 Fixing 1 typo in README
Signed-off-by: Didier Durand <durand.didier@gmail.com>
2020-11-30 10:07:38 +01:00
Phil Estes
ddb47a39f5
Merge pull request #4764 from zhsj/cleanup-systemd
Remove duplicate systemd units file
2020-11-25 11:22:16 -05:00
Derek McGowan
cb2dcb04fc
Merge pull request #4765 from kevpar/panic-file
Fix Windows service panic file to not be read-only
2020-11-24 17:01:11 -08:00
Shengjing Zhu
8344990520 Remove duplicate systemd units file
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-11-25 01:40:52 +08:00
Kevin Parsons
b2420ebcd1 Fix Windows service panic file to not be read-only
Go 1.14 introduced a change to os.OpenFile (and syscall.Open) on Windows
that uses the permissions passed to determine if the file should be
created read-only or not. If the user-write bit (0200) is not set, then
FILE_ATTRIBUTE_READONLY is set on the underlying CreateFile call.

This is a significant change for any Windows code which created new
files and set the permissions to 0 (previously the permissions had no
affect, so some code didn't set them at all).

This change fixes the issue for the Windows service panic file. It will
now properly be created as a non-read-only file on Go 1.14+.

I have looked over the rest of the containerd code and didn't see other
places where this seems like an issue.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-11-24 01:37:00 -08:00
Phil Estes
ebc0ddb28c
Merge pull request #4761 from zhsj/fix-cri-proto
Fix package name in cri runtimeoptions protobuf
2020-11-23 11:55:40 -05:00
Wei Fu
625da6b3e6
Merge pull request #4719 from estesp/fix-shm-relabel-test
Reenable make test targets in GH Actions CI
2020-11-23 13:11:32 +08:00
Shengjing Zhu
fe767f95c7 Fix package name in cri runtimeoptions protobuf
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-11-22 16:15:34 +08:00
Phil Estes
af963cc2cf
Merge pull request #4757 from kevpar/backport-doc
Update backports documentation
2020-11-19 15:35:31 -05:00
Kevin Parsons
7d135f4dad Update backports documentation
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-11-19 12:00:37 -08:00
Kazuyoshi Kato
fd01744a0c Handle an image ref with scheme
An image ref must be a scheme-less URI. A reference with scheme (such
as `http://`) must return ErrInvalid.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-11-19 10:58:21 -08:00
Phil Estes
85d9fe3e8c
Adjust overlay tests to expect "index=off"
When running tests on any modern distro, this assumption will work. If
we need to make it work with kernels where we don't append this option
it will require some more involved changes.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-11-19 10:59:40 -05:00