Commit Graph

8441 Commits

Author SHA1 Message Date
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
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
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
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
Phil Estes
521263ce21
Merge pull request #4721 from thaJeztah/longer_timeout
ga: Linux Integration: extend timeout to 20 minutes
2020-11-10 11:39:11 -05:00
Sebastiaan van Stijn
0299fca49c
ga: Linux Integration: extend timeout to 20 minutes
CI was timing out after 15 minutes on the crun tests; extending
the timeout to 20 minutes (we can make it shorter again if we know
the exact time it takes to run)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 17:08:06 +01:00
Michael Crosby
1e7a6906bf
Merge pull request #4698 from dweomer/test-selinux-enforcing
test: run tests with selinux enforcing
2020-11-10 10:22:46 -05:00
Michael Crosby
5f74840a9a
Merge pull request #4709 from AkihiroSuda/ctr-apparmor
ctr: add AppArmor flags
2020-11-10 10:21:51 -05:00
Michael Crosby
677aaad83c
Merge pull request #4718 from thaJeztah/remove_sudo_remnants
install-runc: remove unused USESUDO variable
2020-11-10 10:18:13 -05:00
Phil Estes
6dc35dfdaa
Merge pull request #4716 from thaJeztah/faster_golang_ci
gha: specify full version for golang-ci-lint to speedup selection
2020-11-10 10:14:22 -05:00
Sebastiaan van Stijn
1edeea7663
install-runc: remove unused USESUDO variable
This is no longer needed, as the script is already run with sudo.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 12:49:21 +01:00
Sebastiaan van Stijn
72dd30feba
gha: specify full version for golang-ci-lint to speedup selection
Noticed this in the CI output:

    Requested golangci-lint 'v1.29', using 'v1.29.0', calculation took 7969ms
    Installing golangci-lint v1.29.0...
    Downloading https://github.com/golangci/golangci-lint/releases/download/v1.29.0/golangci-lint-1.29.0-darwin-amd64.tar.gz ...

Using nearly 8 seconds to convert v1.29 to v1.29.0 seems a bit long,
so hard-coding to the full version to speedup CI somewhat.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-11-10 11:34:57 +01:00
Akihiro Suda
0585213d01
remove unused hack/* files
- hack/test-cri-integration.sh : called from Makefile
- hack/test-utils.sh : called from hack/test-cri-integration.sh
- hack/utils.sh : called from hack/test-utils.sh

Other files are no longer used and can be safely removed.

Kube test-infra doesn't seem to require the removed file as well: https://github.com/kubernetes/test-infra/search?q=containerd+hack

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-11-10 17:19:31 +09:00
Akihiro Suda
9d54648be3
ctr: add AppArmor flags
e.g.
```
$ sudo ./bin/ctr run --apparmor-default-profile "cri-containerd.apparmor.d" docker.io/library/alpine:latest foo cat /proc/self/attr/current
cri-containerd.apparmor.d (enforce)
```

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-11-10 14:19:35 +09:00
Michael Crosby
293b08dd19
Merge pull request #4699 from dweomer/selinx-relabel-dev-shm
cri: selinux relabel /dev/shm
2020-11-09 12:12:35 -05:00
Jacob Blain Christen
a7f24b29c2 test: run tests with selinux enforcing
With container-selinux policy updated to 2.145+ (the default for Fedora 32+) we
can enable SELinux=Enforcing mode in the CI workflow and pass all integration
and CRI tests except one, see https://github.com/containerd/containerd/issues/4460,
which has been marked as skipped.

Tested locally with:
- SELINUX=Enforcing vagrant up --provision-with=shell,selinux,test-integration
- SELINUX=Enforcing vagrant up --provision-with=shell,selinux,test-cri

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-11-09 09:36:52 -07:00
Jacob Blain Christen
e8d8ae3b97 cri: selinux relabel /dev/shm
Address an issue originally seen in the k3s 1.3 and 1.4 forks of containerd/cri, https://github.com/rancher/k3s/issues/2240

Even with updated container-selinux policy, container-local /dev/shm
will get mounted with container_runtime_tmpfs_t because it is a tmpfs
created by the runtime and not the container (thus, container_runtime_t
transition rules apply). The relabel mitigates such, allowing envoy
proxy to work correctly (and other programs that wish to write to their
/dev/shm) under selinux.

Tested locally with:
- SELINUX=Enforcing vagrant up --provision-with=shell,selinux,test-integration
- SELINUX=Enforcing CRITEST_ARGS=--ginkgo.skip='HostIpc is true' vagrant up --provision-with=shell,selinux,test-cri
- SELINUX=Permissive CRITEST_ARGS=--ginkgo.focus='HostIpc is true' vagrant up --provision-with=shell,selinux,test-cri

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-11-06 12:05:17 -07:00
Phil Estes
ac61e58cdd
Merge pull request #4692 from tianon/nosu
Remove setuid gosu in favor of "sudo -E PATH=$PATH ..."
2020-11-05 19:47:55 -05:00
Tianon Gravi
17688a733a Remove setuid gosu in favor of "sudo -E PATH=$PATH ..."
Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-11-05 14:08:05 -08:00
Akihiro Suda
ef79c99576
Merge pull request #4677 from thaJeztah/moby_sys_symlink
replace pkg/symlink with moby/sys/symlink
2020-11-05 00:59:30 +09:00
Akihiro Suda
8d42f86cf4
Merge pull request #4687 from samuelkarp/critest
ci: run critest target for all runtimes
2020-11-05 00:58:00 +09:00
Derek McGowan
8db2fe3852
Merge pull request #4686 from samuelkarp/cri-tests-runtimes
ci: run cri-integration target for all runtimes
2020-11-03 11:13:53 -08:00
Phil Estes
cb8c09290f
Merge pull request #4688 from YLonely/master
bug fix:#4646
2020-11-03 09:26:32 -05:00
YLonely
019148ef4c bug fix:#3448
Signed-off-by: Bowen Yan <loneybw@gmail.com>
2020-11-03 07:47:28 +00:00
Amr Mahdi
b81917ee72 Add comments clarifying copyWithBuffer implementation
Signed-off-by: Amr Mahdi <amramahdi@gmail.com>
2020-11-03 04:25:42 +00:00
Samuel Karp
e3f28eecd9
ci: run critest target for all runtimes
Signed-off-by: Samuel Karp <skarp@amazon.com>
2020-11-02 17:32:17 -08:00
Samuel Karp
a2581d3450
ci: run cri-integration target for all runtimes
Signed-off-by: Samuel Karp <skarp@amazon.com>
2020-11-02 14:36:12 -08:00
Derek McGowan
394be74fdb
Merge pull request #4681 from fuweid/update-godoc-badge
README.md: Use go.dev instead of godoc
2020-11-02 09:42:46 -08:00
Wei Fu
81cf375ec8
Merge pull request #4679 from mikebrow/update-util-versions
updates cri-tools to latest version
2020-11-01 18:56:59 +08:00
Mike Brown
63f673a229 updates cri-tools to latest version
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-31 14:46:44 -05:00
Akihiro Suda
ea56dd3fb6
Merge pull request #4680 from mikebrow/cri-doc-update-testing
refresh cri testing guide after move
2020-10-31 15:01:47 +09:00