Commit Graph

8778 Commits

Author SHA1 Message Date
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
Kathryn Baldauf
95ba6e9f75 Add annotations to task update request api
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2020-11-09 14:13:33 -08:00
Kazuyoshi Kato
bb8aac38a0 Do not hardcode "amd64" on LCOW and Windows-related files
Fixes #3281.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-11-09 13:39:07 -08: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
Wei Fu
9756153170 README.md: Use go.dev instead of godoc
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-10-31 08:10:05 +08:00
Mike Brown
1ab8bdc27b refresh cri testing guide after move
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-30 18:22:37 -05:00
Michael Crosby
3662dc4c0b
Merge pull request #4673 from ehazlett/ctr-runtime-options
config path option to ctr for runtime
2020-10-30 11:00:14 -04:00
Phil Estes
9a672cca91
Merge pull request #4675 from mikebrow/update-default-config-doc-for-annotations
change default for disable snapshot annotations
2020-10-30 09:33:11 -04:00
Sebastiaan van Stijn
1146098421
replace pkg/symlink with moby/sys/symlink
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-30 00:05:15 +01:00
Phil Estes
abe1807a13
Merge pull request #4676 from thaJeztah/typo_fix
httpReadSeeker: fix typo in error-message
2020-10-29 18:43:52 -04:00
Sebastiaan van Stijn
b086062cfd
httpReadSeeker: fix typo in error-message
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-29 23:07:43 +01:00
Mike Brown
b6053fb7c3 change default for disablesnapshotannotations
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-10-29 15:30:13 -05:00
Derek McGowan
5184bccea3
Merge pull request #4631 from dims/copy-a-few-packages-from-moby/moby
Copy pkg/symlink and pkg/truncindex from moby/moby
2020-10-29 09:13:30 -07:00
Evan Hazlett
ef48ef1e4c
add config path option to ctr for runtime
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2020-10-29 15:21:37 +00:00
Wei Fu
f2e8fda82b
Merge pull request #4665 from dmcgowan/update-default-snapshot-annotations
Update make snapshot annotations disabled by default
2020-10-28 21:12:02 +08:00
Amr Mahdi
f6834d4c0b replicate io.Copy optimizations
Signed-off-by: Amr Mahdi <amramahdi@gmail.com>
2020-10-28 05:50:14 +00:00
Derek McGowan
b2642458f9
Update make snapshot annotations disabled by default
This experimental feature should not be enabled by default as
it is not used by any default snapshotters.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-10-27 21:32:25 -07:00
Akihiro Suda
8ff2707a3c
Merge pull request #4610 from shahzzzam/samashah/add-annotations
Add manifest digest annotation for snapshotters
2020-10-28 13:11:49 +09:00