Commit Graph

11307 Commits

Author SHA1 Message Date
Akihiro Suda
4e7915f801
CI: allow Go 1.13 for Docker/Moby compatibility
Docker/Moby still uses Go 1.13 for building containerd binaries.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-04-28 14:09:31 +09:00
Phil Estes
feee16e0e3
Merge pull request #5403 from claudiubelu/cri-integration-images
tests: Refactors container image usage
2021-04-27 14:18:25 -04:00
Akihiro Suda
8e589e873d
Vagrantfile: update to Fedora 34
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-04-27 23:54:38 +09:00
Claudiu Belu
5847340a7d tests: Refactors container image usage
Currently, the cri-integration tests do not work on Windows due to various reasons.
One of the reasons is because all the tests are using Linux-specific images. This
commit refactors the image pulling / usage in the cri-integration tests, making it
easier to update, and easier to configure the a custom registry to pull those images
from.

For Windows runs, custom registries can be created, which will also contain Windows
images, and the cri-integration tests can be configured to use those registries by
specifying the "--image-list" argument, a TOML file which will contain an alternative
mapping of the default images.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-04-27 08:44:21 +00:00
Derek McGowan
b0fb8a5a04
Merge pull request #5400 from dmcgowan/prepare-1.5.0
Prepare v1.5.0-rc.3 release notes
2021-04-26 15:48:51 -07:00
Derek McGowan
9f43eade62
Prepare v1.5.0-rc.3 release notes
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-26 12:01:47 -07:00
Derek McGowan
6b9d4281ce
Merge pull request #5329 from hakman/release-linux-arm64
Release artifacts for Linux ARM64
2021-04-26 11:56:24 -07:00
Paul "TBBle" Hampson
402acd7c1e Small typo fix "reimporst"
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2021-04-27 01:31:32 +10:00
Paul "TBBle" Hampson
f216270595 Use DeactivateLayer to recover layers that we cannot rename
It seems that something has shifted in an API, and vhd.DetachVhd is
returning "failed to open virtual disk: invalid argument" on Windows
Server LTSC 2019.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2021-04-27 01:31:31 +10:00
Phil Estes
04f73e3f8a
Merge pull request #5421 from dims/use-the-multi-arch-versions-of-test-images
Use the multi-arch versions of the test images
2021-04-26 11:01:04 -04:00
Phil Estes
e46a4b3c64
Merge pull request #5423 from dims/test-build-image-script
prow needs some additional setup for docker buildx
2021-04-26 08:24:04 -04:00
Davanum Srinivas
4c7b960cb4
prow needs some additional setup for docker buildx
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-25 22:12:52 -04:00
Davanum Srinivas
2e4c1d4b74
Use the multi-arch version of the test images
volume-copy-up:2.0 and volume-ownership:2.0

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-25 17:49:57 -04:00
Phil Estes
56f1b3fef8
Merge pull request #5419 from dims/script-to-build-images
Add script to build test images
2021-04-24 16:46:00 -04:00
Phil Estes
05a6533730
Merge pull request #5420 from dims/integration-tests-needs-lsof
integration tests needs lsof
2021-04-24 16:44:28 -04:00
Davanum Srinivas
4e00c4b65f
integration tests needs lsof
We need/use `lsof` in integration tests:
https://github.com/containerd/containerd/blob/master/integration/client/container_linux_test.go#L493

`TestShimDoesNotLeakPipes` fails if `lsof` is not present

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-24 07:49:48 -04:00
Davanum Srinivas
177273680e
Add script to build test images
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-23 22:37:10 -04:00
Phil Estes
ca6a41915a
Merge pull request #5416 from dims/add-multi-arch-support-for-test-images-take-2
Add multi-arch support for test images
2021-04-23 16:05:57 -04:00
Davanum Srinivas
1b5d59dfe2
Add multi-arch support for test images
- Add a multi-arch image with linux/amd64 and linux/arm64 (limit to just
  what we are running in CI)
- Bump versions to 2.0 as 1.0 is the single-arch image
- Use `docker buildx` instead of just docker, so we don't need to build
  manifests by hand
- busybox now does not have `nogroup`, since the test needs it, switch
  over from busybox to ubuntu for just the volume-ownership image

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-23 15:07:33 -04:00
Mike Brown
9cf44ee13b
Merge pull request #5406 from dims/separate-jobs-for-build-and-test-for-openlab
New Openlab based job to run ARM64 tests
2021-04-23 10:19:44 -05:00
Davanum Srinivas
78e5297274
add integration tests
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-22 20:53:49 -04:00
Davanum Srinivas
2b0e6cdd42
Separate jobs for build and test for openlab/arm64
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-22 07:21:35 -04:00
Ciprian Hacman
cdd0758534 Release artifacts for Linux ARM64
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
2021-04-22 06:50:22 +03:00
Mike Brown
3dad67eedb
Merge pull request #5203 from tghartland/5008-target-namespace
Support PID NamespaceMode_TARGET
2021-04-21 19:41:38 -05:00
Maksym Pavlenko
cb64dc8250
Merge pull request #5401 from Iceber/use-unbuffered-channel
process: use the unbuffered channel as the done signal
2021-04-21 16:50:32 -07:00
Thomas Hartland
efcb187429 Add unit tests for PID NamespaceMode_TARGET validation
Signed-off-by: Thomas Hartland <thomas.george.hartland@cern.ch>
2021-04-21 19:59:10 +02:00
Thomas Hartland
b48f27df6b Support PID NamespaceMode_TARGET
This commit adds support for the PID namespace mode TARGET
when generating a container spec.

The container that is created will be sharing its PID namespace
with the target container that was specified by ID in the namespace
options.

Signed-off-by: Thomas Hartland <thomas.george.hartland@cern.ch>
2021-04-21 17:54:17 +02:00
Iceber Gu
909660ea92 process: use the unbuffered channel as the done signal
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-04-21 18:24:18 +08:00
Maksym Pavlenko
7b7a230dd2
Merge pull request #5399 from dmcgowan/update-cgroup-vendor
Update cgroups for regenerated protos
2021-04-20 16:19:18 -07:00
Derek McGowan
0f332dadd1
Update cgroups for regenerated protos
The proto version was updated with cgroup in v1.0.0 but
the protos were not regenerated. The v1.0.1 tag fixes this.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-20 15:46:27 -07:00
Michael Crosby
079fe6bca8
Merge pull request #5395 from mikebrow/cmd-check-improve-error-checking
add check quiet option and update usage
2021-04-20 14:43:25 -04:00
Michael Crosby
a3fe5c84c0
Merge pull request #5383 from wzshiming/clean/process-io
move common code to pkg/process from runtime
2021-04-20 14:40:12 -04:00
Derek McGowan
c3f5a6a93d
Merge pull request #5394 from dmcgowan/prepare-1.5.0-rc.2
Prepare 1.5.0-rc.2 release notes
2021-04-20 09:37:42 -07:00
Mike Brown
391b123a5e adds quiet option for ref
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-04-20 09:20:14 -05:00
Adelina Tuvenie
421fc6ea73 Add CI periodic Windows Jobs.
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-04-20 17:18:46 +03:00
Phil Estes
c4d30c173f
Merge pull request #5379 from ktock/fix-push-race
Fix PushHandler cannot push image that contains duplicated blobs
2021-04-20 08:56:07 -04:00
ktock
ab1654d0e2 Fix PushHandler cannot push image that contains duplicated blobs
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2021-04-20 14:00:53 +09:00
Mike Brown
00f8d32ef5 add not found debug out for check cmd; update usage
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-04-19 19:36:10 -05:00
Derek McGowan
55734b1c56
Prepare 1.5.0-rc.2 release notes
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-19 14:00:49 -07:00
Derek McGowan
b1eb024d91
Merge pull request #5393 from dmcgowan/update-containerd-org-deps-1.5
Update containerd vendors to tags
2021-04-19 14:00:19 -07:00
Phil Estes
81c4ac202f
Merge pull request #5256 from kolyshkin/seccomp-enabled
pkg/seccomp: simplify and speed up isEnabled
2021-04-19 15:59:28 -04:00
Derek McGowan
3ef337ae3a
Update containerd vendors to tags
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-19 10:59:29 -07:00
Phil Estes
56512cca7b
Merge pull request #4741 from thaJeztah/kudo_sudo
gha: use sudo -E in some places to prevent dropping env-vars
2021-04-19 10:55:03 -04:00
Akihiro Suda
d2d0afac05
Merge pull request #5385 from thaJeztah/bump_kubernetes_1.20.6 2021-04-19 23:42:33 +09:00
Akihiro Suda
3abfb23b27
Merge pull request #5388 from thaJeztah/update_golang 2021-04-19 22:13:59 +09:00
Sebastiaan van Stijn
fbe1e140f2
Update Go to 1.16.3
go1.16.3 (released 2021/04/01) includes fixes to the compiler, linker, runtime,
the go command, and the testing and time packages. See the Go 1.16.3 milestone
on our issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.3+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.16.2...go1.16.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 13:10:18 +02:00
Sebastiaan van Stijn
c1d1edbad9
gha: use sudo -E in some places to prevent dropping env-vars
Using `-E` preserves environment variables, except for PATH, so PATH has to be
manually set to match the current environment.

I removed env-vars that were redundant (such as `GOPATH=$GOPATH`), which should
be handled by `-E`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 13:04:43 +02:00
Fu Wei
93a602a8bf
Merge pull request #5269 from thaJeztah/update_fifo
go.mod: github.com/containerd/fifo v1.0.0
2021-04-19 18:34:14 +08:00
Shiming Zhang
7966a6652a Cleanup code
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-04-19 16:59:45 +08:00
Sebastiaan van Stijn
5d79d3adbc
go.mod: update kubernetes to v1.20.6
Includes updated protos with the gogo/protobuf fixes for CVE-2021-3121
(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 09:43:25 +02:00