Commit Graph

10590 Commits

Author SHA1 Message Date
Paul "TBBle" Hampson
5b78a9a8f1 Remove hardcoded /tmp in tempfile paths
There's no specific need mentioned at the points it was added, and it
makes the Windows-hosted test run setup slightly weird.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2022-03-06 17:32:25 +11:00
Phil Estes
5427aec4f1
Merge pull request #6595 from zhsj/fix-cri-test
cri: fix integration test on cgroupsv2 system
2022-03-04 13:20:45 -05:00
Phil Estes
f6694f5b27
Merge pull request #6613 from sachaos/feature/use-version-2-config-in-doc
Use version 2 configuration format in docs/PLUGINS.md
2022-03-04 13:19:26 -05:00
Takumasa Sakao
03a5e648bc Use version 2 config and mention containerd config command
Signed-off-by: Takumasa Sakao <tsakao@zlab.co.jp>
2022-03-05 02:22:30 +09:00
Akihiro Suda
c61186d473
Merge pull request #6619 from thaJeztah/bump_go_1.17.8
update to go 1.16.15, 1.17.8 to address CVE-2022-24921
2022-03-05 02:19:08 +09:00
Sebastiaan van Stijn
e0a6f9c7d0
update to go 1.16.15, 1.17.8 to address CVE-2022-24921
Addresses [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921)

go 1.16.15
--------------------

go1.16.15 (released 2022-03-03) includes a security fix to the regexp/syntax package,
as well as bug fixes to the compiler, runtime, the go command, and to the net package.
See the Go 1.16.15 milestone on the issue tracker for details:

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

full diff: https://github.com/golang/go/compare/go1.16.14...go1.16.15

go 1.17.8
--------------------

go1.17.8 (released 2022-03-03) includes a security fix to the regexp/syntax package,
as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509,
and net packages. See the Go 1.17.8 milestone on the issue tracker for details:

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

full diff: https://github.com/golang/go/compare/go1.17.7...go1.17.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-04 16:53:51 +01:00
Fu Wei
1c4b24ac64
Merge pull request #6614 from dmcgowan/update-1.4-status
Update status of 1.4 release
2022-03-04 20:49:49 +08:00
W3QKR2T
b90c466c38 Add ErrUnexpectedStatus to resolver
Signed-off-by: Fabian Hoffmann <fabian.hoffmann@posteo.de>
2022-03-04 10:46:39 +01:00
Derek McGowan
fdaf859aa6
Update status of 1.4 release
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-03-03 20:31:47 -08:00
Gavin Inglis
7b045ea5f0 ctr: improve error relative shim path error msg
addresses https://github.com/containerd/containerd/issues/6464

Return an error if a runtime provided is relative.

Add context to the usage for `ctr run --runtime` indicating that
absolute path to runtime binary must be provided.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
2022-03-03 23:28:03 +00:00
Phil Estes
ab2f7dcdbc
Merge pull request #6568 from katiewasnothere/cri_integration_tests_windows
Update TestContainerSymlinkVolumes to use windows path
2022-03-03 10:19:56 -05:00
Derek McGowan
c523102b52
Merge pull request #6603 from jterry75/support_user_windows
Add --user support for ctr run Windows
2022-03-02 14:45:34 -08:00
Phil Estes
ce8cadfb14
Merge pull request #6608 from dmcgowan/update-releases
Update releases
2022-03-02 15:39:36 -05:00
Derek McGowan
e5efc260d8
Update latest release versions
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-03-02 11:05:21 -08:00
Derek McGowan
63dd929af7
Update release process to include Kubernetes test infrastructure
Signed-off-by: Derek McGowan <derek@mcg.dev>
2022-03-02 11:01:30 -08:00
Derek McGowan
8acbb27647
Merge pull request from GHSA-crp2-qrr5-8pq7
Clean image volume path
2022-03-02 10:03:17 -08:00
Justin Terry
0c79257f59 Add --user support for ctr run Windows
Adds the ability to override the default user
ContainerUser with a custom user if present in
the image or ContainerAdministrator if needed.

Signed-off-by: Justin Terry <jlterry@amazon.com>
2022-03-01 15:28:51 -08:00
Derek McGowan
2a3f1094a4
Merge pull request #6479 from jterry75/jterry75/args_escaped
Adds support for Windows ArgsEscaped images
2022-03-01 15:04:07 -08:00
Michael Crosby
82bce322da
Merge pull request #6558 from kzys/no-weak-import
Do not use weak import
2022-03-01 16:40:48 -05:00
Justin Terry
de3d9993f5 Adds support for Windows ArgsEscaped images
Adds support for Windows container images built by Docker
that contain the ArgsEscaped boolean in the ImageConfig. This
is a non-OCI entry that tells the runtime that the Entrypoint
and/or Cmd are a single element array with the args pre-escaped
into a single CommandLine that should be passed directly to
Windows rather than passed as an args array which will be
additionally escaped.

Signed-off-by: Justin Terry <jlterry@amazon.com>
2022-03-01 13:40:44 -08:00
Michael Crosby
f57d1cf601
Merge pull request #6596 from zhsj/relax-hugetlb
cri: relax test for system without hugetlb
2022-03-01 16:39:48 -05:00
Phil Estes
590ef88c71
Merge pull request #6578 from kzys/upgrade-protobuild
Use containerd/protobuild instead of stevvooe/protobuild
2022-03-01 08:49:41 -05:00
Derek McGowan
d1fc490f8f
Merge pull request #6597 from zhsj/rm-dup-util
integration: remove duplicated util pkg
2022-02-28 10:11:50 -08:00
Shengjing Zhu
775facd573 cri: fix integration test on cgroupsv2 system
TestUpdateContainerResources_MemoryLimit still uses old method to
check memlimit in cgroup.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-28 21:27:53 +08:00
Shengjing Zhu
f1f69d4eeb integration: remove duplicated util pkg
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-28 20:36:01 +08:00
Shengjing Zhu
352a8f49f7 cri: relax test for system without hugetlb
These unit tests don't check hugetlb. However by setting
TolerateMissingHugetlbController to false, these tests can't
be run on system without hugetlb (e.g. Debian buildd).

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-28 01:38:58 +08:00
Qiutong Song
ec90efbe99 Make the temp mount as ready only in container WithVolumes
Signed-off-by: Qiutong Song <songqt01@gmail.com>
2022-02-25 17:53:30 -08:00
Maksym Pavlenko
52471721fd
Merge pull request #6591 from zhsj/bump-go-patricia
go.mod: update to github.com/tchap/go-patricia/v2 v2.3.1
2022-02-25 14:02:20 -08:00
Shengjing Zhu
ea3d2e6433 go.mod: update to github.com/tchap/go-patricia/v2 v2.3.1
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-26 05:04:55 +08:00
Akihiro Suda
4595cdef89
Merge pull request #6585 from estesp/update-go-vers
Update Go version recommendation in getting started
2022-02-24 08:12:56 +09:00
Phil Estes
2b68c03a60
Update Go version recommendation in getting started
Signed-off-by: Phil Estes <estesp@amazon.com>
2022-02-23 15:48:19 -05:00
Phil Estes
2b2372d43e
Merge pull request #6337 from thaJeztah/bump_go_restful
go.mod: update to github.com/emicklei/go-restful/v3 v3.7.3
2022-02-22 17:33:37 -05:00
Phil Estes
c79f501f39
Merge pull request #6331 from ningmingxiao/dev2
fix Implicit memory aliasing in for loop
2022-02-22 17:32:09 -05:00
Maksym Pavlenko
e1026f5fab
Merge pull request #6579 from zhsj/fix-gccgo
Fix build with gccgo
2022-02-22 09:57:35 -08:00
Kazuyoshi Kato
77c0539e9a Use containerd/protobuild instead of stevvooe/protobuild
The new version still supports gogo/protobuf, but can be used with newer
protobuf packages if version = 2.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-02-22 00:03:31 +00:00
Phil Estes
8b9498909d
Merge pull request #6580 from zhsj/replace-ctx
Replace golang.org/x/net/context with std library
2022-02-21 14:13:24 -05:00
Shengjing Zhu
d28981d48e Fix build with gccgo
gccgo changes the mangling scheme
b483d0e0a2

The change is available in gcc-11, which is the least version that
implements go1.16.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-22 02:31:58 +08:00
Shengjing Zhu
f4f41296c2 Replace golang.org/x/net/context with std library
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2022-02-22 02:27:05 +08:00
Kazuyoshi Kato
296f75bd07 Do not use weak import
According to https://github.com/protocolbuffers/protobuf/issues/9184

> Weak fields are an old and deprecated internal-only feature that we never
> open sourced.

This blocks us to upgrade protoc.

Fixes #6232.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-02-21 18:26:40 +00:00
Kazuyoshi Kato
3febabffeb Add protoc-gen-go-fieldpath
This command will replace protobuf/plugin/fieldpath when we migrate
off from gogo/protobuf.

See #6564 for the detail.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2022-02-21 17:36:12 +00:00
Fu Wei
d128c3767b
Merge pull request #6571 from fuweid/fix-6402-for-runc.v1 2022-02-21 13:39:15 +08:00
Wei Fu
7901f4b331 containerd-shim-runc-v1: return init pid when clean dead shim
If containerd-shim-runc-v1 process dead abnormally, such as received
kill -s 9 signal, panic or other unkown reasons, the containerd-shim-runc-v1
server can not reap runc container and forward init process exit event.
This will lead the container leaked in dockerd. When shim dead, containerd
will clean dead shim, here read init process pid and forward exit event
with pid at the same time.

Related to: #6402

Signed-off-by: Jeff Zvier <zvier20@gmail.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2022-02-20 15:12:50 +08:00
Kathryn Baldauf
a3303e7214 Update TestContainerSymlinkVolumes to use windows path
Signed-off-by: Kathryn Baldauf <kabaldau@microsoft.com>
2022-02-18 16:21:40 -08:00
Sebastiaan van Stijn
481fb923c5
go.mod: update to github.com/emicklei/go-restful/v3 v3.7.3
full diff: https://github.com/emicklei/go-restful/compare/v2.9.5...v3.7.3

- Switch to using go modules
- Add check for wildcard to fix CORS filter
- Add check on writer to prevent compression of response twice
- Add OPTIONS shortcut WebService receiver
- Add Route metadata to request attributes or allow adding attributes to routes
- Add wroteHeader set
- Enable content encoding on Handle and ServeHTTP
- Feat: support google custom verb
- Feature: override list of method allowed without content-type
- Fix Allow header not set on '405: Method Not Allowed' responses
- Fix Go 1.15: conversion from int to string yields a string of one rune
- Fix WriteError return value
- Fix: use request/response resulting from filter chain
- handle path params with prefixes and suffixes
- HTTP response body was broken, if struct to be converted to JSON has boolean value
- List available representations in 406 body
- Support describing response headers
- Unwrap function in filter chain + remove unused dispatchWithFilters

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-02-18 21:54:27 +01:00
Phil Estes
c0bbaf5d15
Merge pull request #6491 from jsturtevant/windows-platforms
Use Windows matcher when on Windows platform in all code paths
2022-02-18 13:07:37 -05:00
ruiwen-zhao
fb0b8d6177 Use fs.RootPath when mounting volumes
Signed-off-by: Ruiwen Zhao <ruiwen@google.com>
2022-02-17 19:20:00 +00:00
Fu Wei
3122239ee5
Merge pull request #6452 from zvier/main 2022-02-17 10:50:48 +08:00
Phil Estes
39afc6fd47
Merge pull request #6515 from gabriel-samfira/enable-restart-monitor
[Windows][Integration] Enable TestRestartMonitor
2022-02-16 10:37:29 -05:00
Phil Estes
67bd2e94f4
Merge pull request #6554 from thaJeztah/update_deps2
go.mod: fsnotify v1.5.1, moby/sys/mountinfo v0.6.0, moby/sys/signal v0.7.0
2022-02-16 10:36:48 -05:00
Derek McGowan
39259a8f35
Merge pull request #6531 from dmcgowan/prepare-v1.6.0
Prepare release notes for v1.6.0
2022-02-15 17:48:47 -08:00