github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
10,906 Commits 3 Branches 4 Tags
01a2b793b88459004d319b641b2fc751ab13f21c
Commit Graph

10906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Phil Estes
584110f0b6 Merge pull request #7210 from mxpv/image-list 
Use image lists form integration/client tests
 2022-07-26 12:09:41 -04:00
jianfei.zhang
276a6f133a test: error strings should not be capitalized 
Signed-off-by: jianfei.zhang <jianfei.zhang@daocloud.io>
 2022-07-26 09:56:20 +08:00
Fu Wei
4c1f0cb473 Merge pull request #7212 from dcantah/hcsshim-bumps-0.9.4 2022-07-26 09:53:43 +08:00
Maksym Pavlenko
2b92c70fa4 Fix command line parsing for image list 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-25 14:19:40 -07:00
Daniel Canter
14003683f0 go.mod: Bump hcsshim to v0.9.4 
This tag contains some fixes for hostprocess containers, mainly around
fixing task stats which regressed from a change in v0.9.3.

https://github.com/microsoft/hcsshim/releases/tag/v0.9.4

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-07-25 13:24:34 -07:00
James Jenkins
1e0698e8e8 Fix CRI image pull timeout test for ppc64le 
The ghcr.io/containerd/registry:2.7 image does not support the ppc64le
architecture, causing the TestCRIImagePullTimeout tests to fail when
executed on a ppc64le device.

Replace the ghcr.io/containerd/registry:2.7 image name and index with
the ghcr.io/containerd/volume-ownership:2.1 image and index in the
HoldingContentOpenWriter test.

Change the image pulled in the NoDataTransferred test to the
ghcr.io/containerd/volume-ownership:2.1 image.

Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
 2022-07-25 16:11:42 -04:00
Daniel Canter
c15d8e1560 go.mod: Bump hcsshim to 0.9.3 
This tag brings in a new field to fix an HNS issue in ws2019 as well as
an optimization for collecting Windows stats (memory, cpu, iops).

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2022-07-25 13:03:39 -07:00
Maksym Pavlenko
a9514da757 Update image references for Windows tests 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-25 11:04:59 -07:00
Maksym Pavlenko
2ae5f405d2 Use image lists instead of hardcoded images 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-25 10:54:17 -07:00
Maksym Pavlenko
552d763447 Use image lists in client tests 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-25 10:47:00 -07:00
zounengren
d121efc6d8 replace with selinux label 
Signed-off-by: zounengren <zouyee1989@gmail.com>
 2022-07-24 20:11:16 +08:00
Wei Fu
e6a2c07902 integration: simplify CNI-fp and add README.md 
* Use delegated plugin call to simplify cni-bridge-cni
* Add README.md for cni-bridge-cni

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2022-07-24 11:45:45 +08:00
cosmoer
344431cdd4 fix: support simultaneous create diff for same parent snapshot 
Signed-off-by: Qian Zhang <cosmoer@qq.com>
 2022-07-24 09:34:54 +08:00
Akihiro Suda
db3ecb286b Merge pull request #7203 from jeffwidman/drop-deprecated-ioutil 
Drop deprecated `ioutil`
 2022-07-24 03:18:04 +09:00
Jeff Widman
050cd58ce6 Drop deprecated ioutil 
`ioutil` has been deprecated by golang. All the code in `ioutil` just
forwards functionality to code in either the `io` or `os` packages.

See https://github.com/golang/go/pull/51961 for more info.

Signed-off-by: Jeff Widman <jeff@jeffwidman.com>
 2022-07-23 08:36:20 -07:00
Fu Wei
b0b9c0fb3f Merge pull request #7201 from mxpv/service-opts 2022-07-23 16:54:28 +08:00
Maksym Pavlenko
500ff95f02 Make getServicesOpts a helper 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-22 19:38:45 -07:00