Commit Graph

181 Commits

Author SHA1 Message Date
Phil Estes
4ed3c524cf Update test timeout based on recent cancellations
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-10-08 16:10:55 -07:00
Sebastiaan van Stijn
de1a39bf32 Update Go to 1.17.2
go1.17.2 (released 2021-10-07) includes a security fix to the linker and misc/wasm
directory, as well as bug fixes to the compiler, the runtime, the go command, and
to the time and text/template packages. See the Go 1.17.2 milestone on our issue
tracker for details:

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-10-08 15:26:34 +02:00
Derek McGowan
67b8831461 Update mirror images to take target image name
Allow overwriting the target tag to support mirror images from multiple
sources under our single namespace.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-09-28 14:08:46 -07:00
Maksym Pavlenko
483e23bdcd Merge pull request #6036 from dmcgowan/add-mirror-action
Add github action to mirror image
2021-09-21 16:06:33 -07:00
Derek McGowan
407d606941 Add github action to mirror image
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-09-21 13:23:51 -07:00
Kazuyoshi Kato
97df73004e gha: collect Vagrant VMs' IP addresses
To investigate #5748, this change collects Vagrant VMs' IP addresses.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-09-21 11:40:24 -07:00
Phil Estes
73dbbf5bfa Update to Go 1.17.1
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-09-14 09:12:00 -04:00
Michael Crosby
5e32e9d855 Merge pull request #5917 from mxpv/issue_forms
Use issue forms for bug reporting
2021-09-09 10:53:52 -04:00
Adelina Tuvenie
aeea697d84 Add WS2022 support in Windows Periodic tests
Some extra steps were added for WS2022 in accordance with
the published image on Azure:
- Install Container Feature & reboot VM
- Create NAT network

Temporarily we skip critest steps for WS2022 until all test images
are updated in that project.

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-09-07 15:42:58 +03:00
Maksym Pavlenko
278176db15 Address issue forms feedback
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-08-30 11:46:27 -07:00
Maksym Pavlenko
11ab3cba0e Use issue forms for bug reporting
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-08-26 15:16:22 -07:00
Phil Estes
736222dd87 Merge pull request #5897 from kzys/upgrade-golangci-lint
script: update golangci-lint from v1.38.0 and v1.36.0 to v1.42.0
2021-08-20 11:59:28 -04:00
Kazuyoshi Kato
4dd5ca70fb script: update golangci-lint from v1.38.0 and v1.36.0 to v1.42.0
golint has been deprecated and replaced by revive since v1.41.0.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-08-19 16:27:16 -07:00
Phil Estes
9fe7bc938b Bump integration timeout to 35 min
Go 1.17 go mod download step (used to handle the separate integration
go.mod) seems to do a lot more work/validation than prior Go releases,
requiring more time for integration runs.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-08-19 10:18:17 -04:00
Phil Estes
f8602c3725 Update to Go 1.17
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-08-17 12:27:39 -04:00
Michael Crosby
7f0be5edd8 Merge pull request #5839 from dcantah/ci-weirdness
Fix Linux CI Linter using Go 1.15.14
2021-08-07 21:43:56 -04:00
Sebastiaan van Stijn
42a28ad2ca Update Go to 1.16.7
go1.16.7 (released 2021-08-05) includes a security fix to the net/http/httputil
package, as well as bug fixes to the compiler, the linker, the runtime, the go
command, and the net/http package. See the Go 1.16.7 milestone on the issue
tracker for details:

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-07 18:07:50 +02:00
Fu Wei
fedd657ea0 Merge pull request #5838 from mxpv/ci
Cleanup CI
2021-08-07 11:33:14 +08:00
Daniel Canter
534685f955 Fix Linux CI Linter using go 1.15.14
For some reason the Linux CI runs end up using go 1.15.14 instead of 1.16.6 for
the Windows runs, or any of the other CI steps. Not sure if this is due to
the linter installing it's own version of go or something else.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-08-06 16:22:42 -07:00
Maksym Pavlenko
10eab21a4d Cleanup CI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-08-06 14:59:05 -07:00
Alakesh Haloi
10824eaf2e remove go 1.13 from containerd
We no longer would need go 1.13.x for moby/containerd compatibility with
containerd moving to 1.16.x

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-08-04 11:58:53 -07:00
Radostin Stoyanov
d1e868c832 ci: install criu from PPA
The current latest version of CRIU is 3.15 and soon will be released
3.16. If CRIU is installed from PPA it would always test with the
latest released version.

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
2021-07-29 07:03:59 +01:00
Derek McGowan
5d3e8fd2c0 Merge pull request #5144 from devholic/release-non-cni-version
Update release workflow to upload binary without CNI
2021-07-28 23:03:19 -07:00
Derek McGowan
a3e431ad41 Merge pull request #5725 from adelina-t/enable_critest
Enable critest on Windows Periodic Jobs
2021-07-28 23:01:45 -07:00
Sunghoon Kang
d62d6c11dc Split release steps into multiple tasks
Signed-off-by: Sunghoon Kang <hoon@linecorp.com>
2021-07-28 18:42:54 +09:00
Sunghoon Kang
b4807122d2 Update release workflow to upload binary without CNI
Unlike [containerd/cri](https://github.com/containerd/cri) releases
(https://storage.googleapis.com/cri-containerd-release),
current release workflow doesn't publish binaries without CNI.

Signed-off-by: Sunghoon Kang <hoon@linecorp.com>
2021-07-28 16:56:37 +09:00
Davanum Srinivas
43117cf919 Script to check if entries in go.mod files are in sync
- ensure that the root go.mod and the module specific go.mod have the
  same `require` and `replace` directives for different dependencies.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-07-27 17:52:32 -04:00
Adelina Tuvenie
23bc3db914 Enable critest on Windows
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-07-27 16:35:38 +03:00
Davanum Srinivas
494b940f14 Introduce a new go module - containerd/api for use in standalone clients
In containerd 1.5.x, we introduced support for go modules by adding a
go.mod file in the root directory. This go.mod lists all the things
needed across the whole code base (with the exception of
integration/client which has its own go.mod). So when projects that
need to make calls to containerd API will pull in some code from
containerd/containerd, the `go mod` commands will add all the things
listed in the root go.mod to the projects go.mod file. This causes
some problems as the list of things needed to make a simple API call
is enormous. in effect, making a API call will pull everything that a
typical server needs as well as the root go.mod is all encompassing.
In general if we had smaller things folks could use, that will make it
easier by reducing the number of things that will end up in a consumers
go.mod file.

Now coming to a specific problem, the root containerd go.mod has various
k8s.io/* modules listed. Also kubernetes depends on containerd indirectly
via both moby/moby (working with docker maintainers seperately) and via
google/cadvisor. So when the kubernetes maintainers try to use latest
1.5.x containerd, they will see the kubernetes go.mod ending up depending
on the older version of kubernetes!

So if we can expose just the minimum things needed to make a client API
call then projects like cadvisor can adopt that instead of pulling in
the entire go.mod from containerd. Looking at the existing code in
cadvisor the minimum things needed would be the api/ directory from
containerd. Please see proof of concept here:
github.com/google/cadvisor/pull/2908

To enable that, in this PR, we add a go.mod file in api/ directory. we
split the Protobuild.yaml into two, one for just the things in api/
directory and the rest in the root directory. We adjust various targets
to build things correctly using `protobuild` and also ensure that we
end up with the same generated code as before as well. To ensure we
better take care of the various go.mod/go.sum files, we update the
existing `make vendor` and also add a new `make verify-vendor` that one
can run locally as well in the CI.

Ideally, we would have a `containerd/client` either as a standalone repo
or within `containerd/containerd` as a separate go module. but we will
start here to experiment with a standalone api go module first.

Also there are various follow ups we can do, for example @thaJeztah has
identified two tasks we could do after this PR lands:

github.com/containerd/containerd/pull/5716#discussion_r668821396

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-07-27 07:34:59 -04:00
Sebastiaan van Stijn
d2b6d192db Update cpuguy83/go-md2man binary to v2.0.1
full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.0...v2.0.1

- Fix handling multiple definition descriptions
- Fix inline markup causing table cells to split
- Remove escaping tilde character (prevents tildes (`~`) from disappearing).
- Do not escape dash, underscore, and ampersand (prevents ampersands (`&`) from disappearing).
- Ignore unknown HTML tags to prevent noisy warnings

Note that this only updates the binaries we install. The vendor code also
includes go-md2man (as indirect dependency of urfave/cli). I don't think we use that
feature, so I did not add it to our go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-07-21 12:21:03 +02:00
Akihiro Suda
e72046f86b Update Go to 1.16.6
Release notes: https://golang.org/doc/devel/release#go1.16

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-07-13 14:05:37 +09:00
Derek McGowan
9fa7d15077 Merge pull request #5682 from kzys/gha-fork
gha: make release workflow work in forks
2021-07-09 11:04:00 -07:00
Akihiro Suda
aefabe5462 Dockerfile.test: add "cri-in-userns" (aka rootless) test stage
The `cri-in-userns` stage is for testing "CRI-in-UserNS", which should be used in conjunction with "Kubelet-in-UserNS":
https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2033-kubelet-in-userns-aka-rootless

This feature is mostly expected to be used for `kind` and `minikube`.

Requires Rootless Docker/Podman/nerdctl with cgroup v2 delegation: https://rootlesscontaine.rs/getting-started/common/cgroup2/
(Rootless Docker/Podman/nerdctl prepares the UserNS, so we do not need to create UserNS by ourselves)

Usage:
```
podman build --target cri-in-userns -t cri-in-userns -f contrib/Dockerfile.test .
podman run -it --rm --privileged cri-in-userns
```

The stage is tested on CI with Rootless Podman on Fedora 34 on Vagrant.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-07-09 14:50:04 +09:00
Kazuyoshi Kato
4c6e4a06ff gha: make release workflow work in forks
Fixes #5098.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-07-02 16:16:02 -07:00
Phil Estes
394f864750 Re-enable criu in main integration runs
Ubuntu kernel updates claim that the criu+overlayfs bug is finally fixed
in released kernels.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-06-16 17:46:27 -04:00
Phil Estes
3ab9744336 Add proper Go version before project checks
Due to a change in Go, the go.mod file cannot declare a version of Go
above the installed `go version`; until the default Go version in GitHub
actions virt environments is 1.16, we have to install 1.16 before
running the project checks now.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-06-10 10:48:25 -04:00
Adelina Tuvenie
af5a130bc9 Enable cri-integration in Windows Periodic Tests
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-06-08 17:53:29 +03:00
Adelina Tuvenie
5f0fc4893d Add creation timestamp to RG
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-06-02 13:16:40 +03:00
Derek McGowan
05c03de94d Update Windows periodic tests
Allow these tests to be manually triggered as well

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-28 10:37:25 -07:00
Derek McGowan
334e74765e Merge pull request #5165 from adelina-t/azure_ci_workflow
Add CI periodic Windows Jobs.
2021-05-28 08:12:25 -07:00
Adelina Tuvenie
77285e311c Schedule Windows job daily after midnight.
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-05-18 18:25:09 +03:00
Adelina Tuvenie
2b58782df0 Update windows-periodic.yml
Add 2019 to matrix

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-05-18 18:25:00 +03:00
Maksym Pavlenko
08fa9ab625 Merge pull request #5459 from dmcgowan/prepare-default-branch-rename
Prepare default branch rename
2021-05-11 09:56:32 -07:00
Jintao Zhang
79d800b9b0 Update Go to 1.16.4
fix [#45710](https://github.com/golang/go/issues/45710) and CVE-2021-31525.

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2021-05-07 07:07:09 +08:00
Derek McGowan
0ba7303ee8 Prepare default branch rename
Use renamed branch for containerd/project

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-06 09:28:42 -07:00
Mike Brown
b56527cb7e update seccomp version
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-05-03 19:36:16 -05:00
Maksym Pavlenko
df0cc5bd18 Merge pull request #5437 from dmcgowan/revert-arm64-release-builds
Revert arm64 release builds
2021-04-29 20:17:18 -07:00
Derek McGowan
5d2e8e86d7 Revert "Release artifacts for Linux ARM64"
This reverts commit cdd0758534.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-29 15:05:59 -07:00
Derek McGowan
7942ae68b1 Revert "Specify seccomp target arch for CC"
This reverts commit 969ec89493.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-29 15:05:54 -07:00
Michael Crosby
32005190c0 Merge pull request #5431 from AkihiroSuda/go113
CI: allow Go 1.13 for Docker/Moby compatibility
2021-04-29 14:07:07 -04:00