Commit Graph

10590 Commits

Author SHA1 Message Date
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
Phil Estes
027ee569a3
Import crypto for all snapshotters during testsuite
Fixes runtime panic for testing snapshotters

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-11-19 08:50:07 -05:00
Phil Estes
af2fb4eb77
Allow oom adj test to run in environments with a score
GitHub Actions process wrapper sets score adj to 500 for any process;
the OOM score adj test expected default adj to be 0 during test.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-11-19 08:43:32 -05:00
Phil Estes
c11472d31d
Add Go test runs to GitHub Actions CI
Disable devmapper for now until test issues are fixed.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-11-19 08:43:14 -05:00
Maksym Pavlenko
0d4734655f
Merge pull request #4647 from katiewasnothere/task_update_annotations_upstream
Add annotations to task update request api
2020-11-18 14:44:19 -08:00
Maksym Pavlenko
2837fb35a7
Merge pull request #4715 from thaJeztah/remove_libcontainer_apparmor
pkg/cri/server: remove dependency on libcontainer/apparmor, libcontainer/utils
2020-11-18 14:34:48 -08:00
Maksym Pavlenko
25e4774ad8
Merge pull request #4589 from cpuguy83/windows_int_overflow
Fix integer overflow on windows
2020-11-18 12:39:59 -08:00
Phil Estes
618c8bd772
Merge pull request #4745 from estesp/fix-actions-cve
Update other actions for env/path CVE fix
2020-11-17 15:28:03 -05:00
Phil Estes
159fb2e7e2
Update other actions for env/path CVE fix
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-11-17 14:20:48 -05:00
Michael Crosby
340ab572de
Merge pull request #4707 from kzys/lcow-arm
Do not hardcode "amd64" on LCOW and Windows-related files
2020-11-17 11:19:57 -05:00
Phil Estes
0edc412565
Merge pull request #4742 from thaJeztah/bump_kubernetes_1.19.4
vendor: kubernetes v1.19.4
2020-11-17 10:23:58 -05:00
Sebastiaan van Stijn
85b1cf1281
vendor: kubernetes v1.19.4
relevant changes:

- TLS transport cache: don't cache transports for incomparable configs

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-17 12:51:39 +01:00
Phil Estes
8efb17cc99
Merge pull request #4705 from dweomer/selinx-relabel-dev-shm-but-not-with-hostipc
cri: selinuxrelabel=false for /dev/shm w/ host ipc
2020-11-16 21:27:54 -05:00
Brian Goff
bd7c6ca6fa Fix integer overflow on windows
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-11-16 19:21:00 +00:00
Phil Estes
cc3785c815
Merge pull request #4653 from amrmahdi/amrh/optimize-content-transfer
Improve image pull performance from http 1.1 container registries
2020-11-16 14:00:29 -05:00
Phil Estes
1c98aa532c
Merge pull request #4735 from AkihiroSuda/go-1.15.5
Bump Golang 1.15.5
2020-11-16 08:21:25 -05:00
Akihiro Suda
af0a20a4d5
Bump Golang 1.15.5
Changes: https://golang.org/doc/devel/release.html#go1.15

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-11-16 14:36:35 +09:00