Commit Graph

11307 Commits

Author SHA1 Message Date
Michael Crosby
aa2733c202
Merge pull request #6170 from olljanat/default-sysctls
CRI: Support enable_unprivileged_icmp and enable_unprivileged_ports options
2021-11-18 11:37:23 -05:00
haoyun
f8d734e406 fix: make max recv/send msg size setting default
Signed-off-by: haoyun <yun.hao@daocloud.io>
2021-11-18 09:54:31 +08:00
Derek McGowan
a776a27af5
Merge pull request from GHSA-5j5w-g665-5m35
images: validate document type before unmarshal
2021-11-17 10:54:25 -08:00
Derek McGowan
9afc778b73
Merge pull request #6111 from crosbymichael/latency-metrics
[cri] add sandbox and container latency metrics
2021-11-16 16:59:33 -08:00
Justin Terry
63895de455 Add support for TMP override on toml
When running containerd as a service it may be hard to
override the TMP location of the process. This is especially
true on Windows when running containerd in SCM. This change
allows you to set the 'temp' location in the config.toml when
the service starts up that overrides its TEMP/TMP/TMPDIR usage.

This is helpful on Linux as well but it primarily solves the
performance issue on Windows when running containerd across
volumes. IE: If you configure your data/root paths on a volume
other than the SystemDrive the snapshotter does a temporary unpack
on the SystemDrive and then has to copy contents of that data
to the snapshot folder on the destination volume. By alinging the
tmp with the destination it is a simple move operation instead of
a copy operation.

Signed-off-by: Justin Terry <jlterry@amazon.com>
2021-11-16 10:43:48 -08:00
Maksym Pavlenko
4aea5da858
Merge pull request #6255 from aznashwan/generalize-windows-ci-setup-user
Integration: Generalize Windows CI setup scripts for any username.
2021-11-16 10:12:01 -08:00
Phil Estes
7758cdc09a
Merge pull request #6253 from jonyhy96/feat-rwmutex
feat: use rwmutex instead
2021-11-16 11:39:29 -05:00
Nashwan Azhari
444ef2f6d7 Generalize Windows CI setup script for any user.
The current Windows CI setup script assumes it will always be run under
the `azureuser` username.

While this username is defined in the Windows CI GitHub action, the
current version of the script both exposes us to a future risk of
breaking should the CI action be changed, and is also unfriendly to
`curl | sh`-ing it for quick test environment setups.

This patch makes the Windows CI setup script work with any username
provided they have administrative privileges.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2021-11-16 17:30:40 +02:00
Nashwan Azhari
3d6bfa3f55 Standardize cmdlet capitalization in Windows CI scripts.
This patch standardizes the capitalization of PowerShell commandlets in
the Windows CI setup script in accordance with general PowerShell best
practices.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
2021-11-16 17:25:54 +02:00
Derek McGowan
6835a94707
Split runc shim into plugin components
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-11-15 20:16:45 -08:00
Derek McGowan
6eea8f3f62
Add shutdown package
Allows shutdown to handle callbacks with similar behavior as context
cancel

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-11-15 20:16:45 -08:00
haoyun
547040cd5b feat:support custom callopts on client side
Signed-off-by: haoyun <yun.hao@daocloud.io>
2021-11-16 11:31:33 +08:00
haoyun
bef792b962 feat: use rwmutex instead
Signed-off-by: haoyun <yun.hao@daocloud.io>
2021-11-16 11:06:40 +08:00
Derek McGowan
d055487b00
Merge pull request #6206 from mxpv/path
Allow absolute path to shim binaries
2021-11-15 18:05:48 -08:00
Derek McGowan
77e76d7a52
Merge pull request #6246 from wzshiming/fix/close-file-with-modify-perm
Close file if permission modification fails
2021-11-15 15:45:35 -08:00
Phil Estes
eee8c969d9
Merge pull request #6250 from cpuguy83/fix_release_tar_name
release: change tar name to match prior releases
2021-11-15 16:15:34 -05:00
Brian Goff
2f31dcda7f release: change tar name to match prior releases
In prior releases we were not using this variable and instead were
self-constructing a release tar file.
This was changed in 27d7c50384
The change means the variable is being used now and is causing the
artifacts to be produced to have a different name which may break
download scripts.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-11-15 20:05:17 +00:00
Samuel Karp
70c88f5075
schema1: reject ambiguous documents
Signed-off-by: Samuel Karp <skarp@amazon.com>
2021-11-15 12:00:42 -08:00
Samuel Karp
eb9ba7ed8d
images: validate document type before unmarshal
Signed-off-by: Samuel Karp <skarp@amazon.com>
2021-11-15 11:54:11 -08:00
Olli Janatuinen
2a81c9f677 CRI: Support enable_unprivileged_icmp and enable_unprivileged_ports options
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2021-11-15 18:30:09 +02:00
Shiming Zhang
db124c560c Close file if permission modification fails
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-11-15 16:57:05 +08:00
Maksym Pavlenko
5b09dc5eb0
Merge pull request #6237 from cpuguy83/fix_wrong_restore_error
Fix wrong error returned for image index lookup
2021-11-12 11:46:42 -08:00
Derek McGowan
aa1b073616
Merge pull request #6221 from ktock/urls-fallback
Fix containerd fails to pull OCI image with non-`http(s)://` urls
2021-11-11 21:44:04 -08:00
Kohei Tokunaga
526defb571 Fix containerd fails to pull OCI image with non-http(s):// urls
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2021-11-12 09:49:28 +09:00
Brian Goff
89eebc4c0f Fix wrong error returned for image index lookup
Seems like this was the wrong error given that we are looking up image
label.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-11-12 00:18:59 +00:00
Derek McGowan
bd81f8a39d
Merge pull request #6223 from dmcgowan/v1.6.0-beta.2
Prepare release notes for v1.6.0-beta.2
2021-11-11 14:41:54 -08:00
Phil Estes
bd30398f4b
Merge pull request #6196 from cpuguy83/add_arm64_release 2021-11-11 17:12:21 -05:00
Brian Goff
be84932e11 Rename release dockerfile to omit distro name
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-11-11 20:06:49 +00:00
Tonis Tiigi
28126fd605 release: improve dockerfile
Removes amd64 specifics and hardcoded arm64 package pulls.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2021-11-11 20:06:47 +00:00
Brian Goff
27d7c50384 Add arm64 to releases
This moves all the release builds into a Dockerfile which is a bit
cleaner for setting up our build environment.

Non-linux/amd64 builds are cross-compiled.
Currently onlinux linux/amd64, linux/arm64, and windows/amd64 are
supported, but is easy to add more, provided their is a cross-compile
toolchain available for it.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-11-11 20:00:34 +00:00
Derek McGowan
7ad570964b
Merge pull request #6236 from crosbymichael/cri-panic
use write lock when updating container stats
2021-11-11 09:34:09 -08:00
Michael Crosby
6765524b73 use write lock when updating container stats
Signed-off-by: Michael Crosby <michael@thepasture.io>
2021-11-11 15:17:48 +00:00
Derek McGowan
9093c1c69f
Merge pull request #6230 from dcantah/update-hcsshim-0.9.1
go.mod: Bump hcsshim to v0.9.1
2021-11-10 20:29:01 -08:00
Daniel Canter
b103bee4cc go.mod: Bump hcsshim to v0.9.1
This tag contains some changes for the Windows shim for retrying
stdio named pipe connections if containerd restarts. It also is built with v1.1.0 of
ttrpc which has some fixes for a deadlock we'd observed on Windows.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-11-10 16:26:18 -08:00
Maksym Pavlenko
e17fe37e01 Fix package alias
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-11-10 14:29:41 -08:00
Phil Estes
60c55c80f4
Merge pull request #6228 from dcantah/update-ttrpc-1.1.0
go.mod: Bump ttrpc to 1.1.0
2021-11-10 16:09:11 -05:00
Daniel Canter
920b24793d go.mod: Bump ttrpc to 1.1.0
This tag contains a fix for a deadlock observed when there are multiple
simultaneous requests from the same client connection.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-11-10 10:20:14 -08:00
Maksym Pavlenko
6870f3b1b8 Support custom runtime path when launching tasks
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-11-09 13:31:46 -08:00
Michael Crosby
91bbaf6799 [cri] add sandbox and container latency metrics
These are simple metrics that allow users to view more fine grained metrics on
internal operations.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2021-11-09 21:07:38 +00:00
Michael Crosby
195def141f
Merge pull request #6213 from thaJeztah/bump_moby_sys
go.mod: bump moby/sys/symlink v0.2.0, moby/sys/signal v0.6.0, moby/sys/mountinfo v0.5.0
2021-11-09 15:57:35 -05:00
Michael Crosby
4b7cc560b2
Merge pull request #6222 from jonyhy96/add-more-description
cleanup: add more description on comment
2021-11-09 15:55:32 -05:00
Derek McGowan
a3b756ce18
Prepare release notes for v1.6.0-beta.2
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-11-09 11:25:18 -08:00
haoyun
5748006337 cleanup: add more description on comment
Signed-off-by: haoyun <yun.hao@daocloud.io>
2021-11-09 19:13:37 +08:00
Phil Estes
432ddecaae
Merge pull request #6211 from thaJeztah/bump_go_1.17.3
Update Go to 1.17.3
2021-11-08 11:49:23 -08:00
Phil Estes
76a63427ee
Merge pull request #6214 from AkihiroSuda/crun-1.3
CI: bump up crun: 1.0 -> 1.3
2021-11-08 11:48:46 -08:00
Akihiro Suda
a22346622b
CI: bump up crun: 1.0 -> 1.3
Release notes: https://github.com/containers/crun/releases

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-11-08 14:32:53 +09:00
Sebastiaan van Stijn
97073c9437
go.mod: github.com/moby/sys/mountinfo v0.5.0
full diff: https://github.com/moby/sys/compare/95edfa939201...mountinfo/v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:10:26 +01:00
Sebastiaan van Stijn
19d9d0d2a5
go.mod: github.com/moby/sys/signal v0.6.0
full diff: https://github.com/moby/sys/compare/8a51b5cc8879...signal/v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:08:07 +01:00
Sebastiaan van Stijn
9c455ded61
go.mod: github.com/moby/sys/symlink v0.2.0
full diff: https://github.com/moby/sys/compare/symlink/v0.1.0...symlink/v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:05:38 +01:00
Sebastiaan van Stijn
fa12f4e696
go.mod: golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
full diff: ed5796bab1...69cdffdb93

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-11-05 13:03:15 +01:00