Commit Graph

10923 Commits

Author SHA1 Message Date
Maksym Pavlenko
ff65fc2d0e Make TaskList generic
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-10 14:02:53 -07:00
Maksym Pavlenko
23f66ece59
Merge pull request #7254 from mxpv/go
Switch to Go 1.19
2022-08-10 12:12:49 -07:00
Akihiro Suda
4902059cb5
Merge pull request #7265 from fuweid/dump-containerd-log-after-finish
Vagrantfile: dump containerd log after critest
2022-08-07 22:45:21 +09:00
Wei Fu
782fd3c8e6 Vagrantfile: dump containerd log after critest
It is used to debug if there is any flaky test cases.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-08-07 12:36:17 +08:00
Fu Wei
6deb1174fb
Merge pull request #7257 from junnplus/group-id
oci: skip checking group id for WithAppendAdditionalGroups
2022-08-07 12:15:20 +08:00
Maksym Pavlenko
74c09b7569 Fix contrib/ header
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-06 10:27:40 -07:00
Maksym Pavlenko
8add7e5d39 Rework permission handling in scripts
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-05 17:05:36 -07:00
Derek McGowan
de68174ec3
Merge pull request #7259 from samuelkarp/release-workflow
release workflow: increase timeout to 30 minutes & remove Go setup action
2022-08-05 16:57:07 -07:00
Samuel Karp
d7c952a053
Merge pull request #7258 from AkihiroSuda/fix-7255 2022-08-05 15:02:18 -07:00
Samuel Karp
6ba91de840
release workflow: remove Go setup action
Release builds are performed from within a Dockerfile-defined
environment and do not require Go to be installed in the GitHub Actions
runner environment.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
2022-08-05 10:09:30 -07:00
Samuel Karp
f8add9263a
release workflow: increase timeout to 30 minutes
In the 1.6.7 release, we saw significantly longer execution time for
producing builds that exceeded the previous timeout of 10 minutes,
causing the workflow to fail.  After increasing to 20 minutes in the
release/1.6 branch, we continued to see one failure (which succeeded on
retry).

Increase to 30 minutes to provide additional buffer for the build to
complete.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
2022-08-05 10:08:04 -07:00
Ye Sijun
2dbff1dbca
oci: skip checking gid for WithAppendAdditionalGroups
Signed-off-by: Ye Sijun <junnplus@gmail.com>
2022-08-06 00:57:19 +08:00
Akihiro Suda
4818610207
release: rollback Ubuntu to 18.04 (except for riscv64)
Partially revert 0e56e4f9ff

Rollback the build environment from Ubuntu 22.04 to 18.04, except for riscv64 that isn't supported by Ubuntu 18.04.

Fix issue 7255 (`1.6.7 can't be run on Ubuntu LTS 20.04 (GLIBC_2.34 not found)`)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-08-06 01:00:49 +09:00
Maksym Pavlenko
68bae258a3 Update protobuf definitions
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 19:28:58 -07:00
Maksym Pavlenko
ca3b9b50fe Run gofmt 1.19
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 18:18:33 -07:00
Maksym Pavlenko
4a11a40189 Update golangci-lint to 1.48 with Go 1.19 support
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 18:16:17 -07:00
Maksym Pavlenko
ea66130295 Switch to Go 1.19
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 18:05:44 -07:00
Maksym Pavlenko
01a2b793b8
Merge pull request #7228 from mxpv/sb2
Initial sandbox API CRI integration.
2022-08-04 17:46:38 -07:00
Fu Wei
182b6995c0
Merge pull request #7251 from mxpv/env 2022-08-05 08:26:35 +08:00
Maksym Pavlenko
7787168ccc Use global env variable to specify Go version on CI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 14:50:29 -07:00
Maksym Pavlenko
5cf77fc43d Add TODOs for the remaining work
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-08-04 10:29:15 -07:00
Mike Brown
1e6523fe9d
Merge pull request #7243 from dcantah/update-go-main
Update golang to 1.18.5, 1.17.13
2022-08-02 16:12:50 -05:00
Daniel Canter
e1c5d71c0c Update golang to 1.18.5, 1.17.13
Update Go runtime to 1.18.5 to address CVE-2022-32189.

Full diff:
https://github.com/golang/go/compare/go1.18.4...go1.18.5

--------------------------------------------------------

From the security announcement:
https://groups.google.com/g/golang-announce/c/YqYYG87xB10

We have just released Go versions 1.18.5 and 1.17.13, minor point
releases.

These minor releases include 1 security fixes following the security
policy:

encoding/gob & math/big: decoding big.Float and big.Rat can panic

Decoding big.Float and big.Rat types can panic if the encoded message is
too short.

This is CVE-2022-32189 and Go issue https://go.dev/issue/53871.

View the release notes for more information:
https://go.dev/doc/devel/release#go1.18.5

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-02 11:54:45 -07:00
Fu Wei
e2069e99f0
Merge pull request #7023 from dcantah/fix-panicfile-shimlogging 2022-08-02 14:44:47 +08:00
Daniel Canter
ee0f2e9064 Change os.Stderr reassign for Windows service
Previously we were reassigning os.Stderr to the panic.log file we create
when getting asked to run Containerd as a Windows service. The panic.log
file was used as a means to easily collect panic stacks as Windows
services don't have regular standard IO, and the usual recommendation
is to either write to the event log or just to a file in the case of
running as a service.

One place where this panic.log flow was biting us was with shim logging,
which is forwarded from the shim and copied to os.Stderr directly which was
causing shim logs to get forwarded to this panic.log file instead of just
panics. We expose an additional `--log-file` flag if you ask to run a
windows service which is the main way you'd get Containerd logs, and with
this change all of the shim logging which would today end up in panic.log
will now also go to this log file.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-08-01 16:36:41 -07:00
Phil Estes
f4a5e73190
Merge pull request #7237 from fahedouch/fix-protobuf-archi
script/setup: fix protobuf for aarch64
2022-08-01 17:48:10 -04:00
fahed dorgaa
426fcfbc52 fix protobuf aarch64
Signed-off-by: fahed dorgaa <fahed.dorgaa@gmail.com>
2022-08-01 18:12:41 +02:00
Maksym Pavlenko
aa3303b697 Update sandbox protobuf to match CRI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-29 16:08:07 -07:00
Maksym Pavlenko
8823224174 Update controller's start response to incldue pid and labels
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-29 16:08:07 -07:00
Maksym Pavlenko
3d028308ef Cleanup CRI files
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-29 16:08:07 -07:00
Maksym Pavlenko
c085fac1e5 Move sandbox start behind controller
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-29 16:08:07 -07:00
Maksym Pavlenko
f51014f8d5 Add sandbox to in memory services
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-29 16:08:07 -07:00
Fu Wei
4d395bffea
Merge pull request #7232 from mxpv/ci-logs 2022-07-30 07:05:40 +08:00
Maksym Pavlenko
6c14ca25d4 Fix cleanup in critest
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-29 13:44:14 -07:00
Fu Wei
8a6ea4b21c
Merge pull request #7204 from cosmoer/fix-support-simultaneous-create-diff 2022-07-29 14:33:58 +08:00
Derek McGowan
d4b80b8123
Merge pull request #7223 from dcantah/hpc-stats
Windows HostProcess container CRI stats test
2022-07-28 14:20:37 -07:00
Maksym Pavlenko
e47c433d57 Add sandbox store helpers
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2022-07-28 14:17:39 -07:00
Maksym Pavlenko
7b55b23a82
Merge pull request #7226 from cpuguy83/regen-protos
Regenerate protos with updated protoc-gen-go
2022-07-28 14:11:05 -07:00
Brian Goff
f5fb2c32d2 Regenerate protos with updated protoc-gen-go
This fixes CI issues

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2022-07-28 16:59:30 +00:00
Daniel Canter
b16c3e9adf Windows HostProcess container CRI stats test
Add a test to the CRI suite to validate stats functions for hostprocess
containers. hcsshim v0.9.3 had a bug in stats collection so this is
mainly for sanity and to avoid another regression.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-07-27 15:45:37 -07:00
Derek McGowan
b848924ae8
Merge pull request #7195 from falser101/feature/cleanup
test: error strings should not be capitalized
2022-07-27 15:19:34 -07:00
Derek McGowan
c0ca151b33
Merge pull request #7220 from jonnystoten/push-access-denied
Add extra context to error when push unauthorized
2022-07-27 13:29:29 -07:00
Fu Wei
116af9d1cc
Merge pull request #7207 from zouyee/relabel
replace with selinux label
2022-07-28 00:05:31 +08:00
Fu Wei
5af0edbe29
Merge pull request #7221 from jonnystoten/fix-http-debug
Use `httputil.DumpRequestOut` for dumping client req
2022-07-28 00:02:15 +08:00
Fu Wei
5ce1e46fa4
Merge pull request #7215 from Jenkins-J/ppc64le-cri-test-fix
Fix CRI image pull timeout test for ppc64le
2022-07-27 23:48:56 +08:00
Jonny Stoten
106433b798
Use httputil.DumpRequestOut for dumping client req
httputil.DumpRequest is only for dumping incoming requests on a server.

Signed-off-by: Jonny Stoten <jonny.stoten@docker.com>
2022-07-27 12:36:14 +01:00
Jonny Stoten
2fa84b1b8d
Add extra context to error when push unauthorized
For consistency with pulls, see #2052.

Signed-off-by: Jonny Stoten <jonny.stoten@docker.com>
2022-07-27 12:23:18 +01:00
Derek McGowan
6acde90772
Merge pull request #7069 from fuweid/failpoint-in-runc-shimv2
test: introduce failpoint control to runc-shimv2 and cni
2022-07-26 23:12:20 -07:00
Fu Wei
f81b0e2057
Merge pull request #7206 from renbaoshuo/patch-1 2022-07-27 10:52:24 +08:00
Baoshuo
f4d05f2073
chore: bump macos runner version
GitHub Action is sunsetting the macOS 10.15 Actions runner. It will stop working intermittently until being completely removed by 2022-8-30: https://github.blog/changelog/2022-07-20-github-actions-the-macos-10-15-actions-runner-image-is-being-deprecated-and-will-be-removed-by-8-30-22

Signed-off-by: Baoshuo Ren <i@baoshuo.ren>
2022-07-27 09:54:18 +08:00