github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,470 Commits 3 Branches 2 Tags 112 MiB
7ccd0646e4
Commit Graph

8470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Phil Estes
0ec47b3348
Merge pull request #4730 from thaJeztah/update_seccomp_profile 
seccomp: add pidfd syscalls
 2020-11-13 09:24:34 -05:00
Sebastiaan van Stijn
0a1104bcf3
seccomp: add pidfd_getfd syscall (gated by CAP_SYS_PTRACE) 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-11-13 13:36:33 +01:00
Sebastiaan van Stijn
2dbbd10fd6
seccomp: add pidfd_open and pidfd_send_signal 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-11-13 13:36:25 +01:00
Sebastiaan van Stijn
eba94a15c8
pkg/cri/server: remove dependency on libcontainer/apparmor, libcontainer/utils 
recent versions of libcontainer/apparmor simplified the AppArmor
check to only check if the host supports AppArmor, but no longer
checks if apparmor_parser is installed, or if we're running
docker-in-docker;

bfb4ea1b1b

> The `apparmor_parser` binary is not really required for a system to run
> AppArmor from a runc perspective. How to apply the profile is more in
> the responsibility of higher level runtimes like Podman and Docker,
> which may do the binary check on their own.

This patch copies the logic from libcontainer/apparmor, and
restores the additional checks.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-11-12 15:42:25 +01:00
Jacob Blain Christen
a1e7dd939d cri: selinuxrelabel=false for /dev/shm w/ host ipc 
This is a followup to #4699 that addresses an oversight that could cause
the CRI to relabel the host /dev/shm, which should be a no-op in most
cases. Additionally, fixes unit tests to make correct assertions for
/dev/shm relabeling.

Discovered while applying the changes for #4699 to containerd/cri 1.4:
https://github.com/containerd/cri/pull/1605

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-11 15:22:17 -07:00
Derek McGowan
fca7887186
Merge pull request #4726 from estesp/update-btrfs 
Update btrfs vendor for chkptr fix for Go >= 1.14
 2020-11-11 12:03:41 -08:00
Phil Estes
6fb56aa58b
Update btrfs vendor for chkptr fix for Go >= 1.14 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-11-11 14:13:26 -05:00
Derek McGowan
78ac7bac84
Merge pull request #4725 from kzys/fix-links-in-docs 
docs: fix broken links
 2020-11-11 10:40:19 -08:00
Derek McGowan
f1ea895fbb
Merge pull request #4713 from AkihiroSuda/remove-hack-unused 
remove unused hack/* files
 2020-11-11 10:37:53 -08:00
Kazuyoshi Kato
03cc4cedc5 docs: fix broken links 
This change fixes broken links in docs/.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2020-11-11 10:19:17 -08:00
Phil Estes
4dc698d09b
Merge pull request #4723 from lining2020/ctr-error-hint 
ctr: fix the incorrect image unmount error hint
 2020-11-11 09:40:49 -05:00
Phil Estes
1309384af0
Merge pull request #4724 from tonistiigi/pusher-error 
docker: don’t hide pusher response error
 2020-11-11 09:39:50 -05:00
Li Ning
97cee75da8 ctr: fix the incorrect image unmount error hint 
Signed-off-by: Li Ning <lining@cmss.chinamobile.com>
 2020-11-11 19:57:31 +08:00
Tonis Tiigi
f601887a3c docker: don’t hide pusher response error 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2020-11-10 23:19:08 -08:00
Mike Brown
687fcd73ec
Merge pull request #4722 from kzys/cri-docs 
Move CRI plugin's docs from docs/ to docs/cri/
 2020-11-10 17:00:52 -05:00
Kazuyoshi Kato
a05fa4214d Move CRI plugin's docs from docs/ to docs/cri/ 
There are a lot of documents which are specifically talking about
the CRI plugin. These docs should be in docs/cri/.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2020-11-10 11:49:05 -08:00