Commit Graph

10081 Commits

Author SHA1 Message Date
Derek McGowan
1dcfe7fa8e
Merge pull request #5040 from estesp/http-trace
Enable Go HTTP tracing of registry interactions
2021-03-03 15:12:52 -08:00
Derek McGowan
6762c6f2d3
Merge pull request #5115 from kevpar/update-hcsshim
Update github.com/Microsoft/hcsshim to v0.8.15
2021-03-03 14:52:42 -08:00
Maksym Pavlenko
e1b4c0ad43 Remove flaky devmapper check
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-03-03 14:51:11 -08:00
Phil Estes
2f71f4f63c
Merge pull request #5116 from fuweid/carry-4825
cri: check fsnotify watcher when receiving cni conf dir events
2021-03-03 17:26:57 -05:00
Jeremy Williams
51a72f0492 mark device faulty after parent fails to suspend
When an error is returned here, unlike the other error returns in the function, nothing is done to mark the added device as faulty or remove it.
I have observed this causing future snapshot creations to continue to attempt to use the same ID (from the sequence) to create new devices
and get blocked because the device already exists because it was not rolled back here.

Hopefully fixes #5110

Signed-off-by: Jeremy Williams <ctrlaltdel121@gmail.com>
2021-03-03 17:02:07 -05:00
Phil Estes
91ff314980
Merge pull request #5009 from thaJeztah/fix_install_scripts
script/setup: use git clone instead of go get -d
2021-03-03 16:18:27 -05:00
Sebastiaan van Stijn
164573897c
script/setup: use git clone instead of go get -d
`go get -d` uses go modules by default in Go 1.16 and up, which results
in modules being fetched for the "latest" module version, after which we
tried to "git checkout" to `<VERSION>`.

For runc, this means that (possibly incorrectly), `go get` will download
runc `v0.1.1` (most recent non-"pre-release", which caused failures (e.g
the old `Sirupsen/logrus` being downloaded).

In addition, some of the dependencies we're installing use vendoring, and
thus would not require the modules to be downloaded (and vendored files
will be ignored when using `go get` with modules).

This patch switches several uses `go get -d` to use a regular
git clone, after which the desired version is checked out,
and the binaries are built.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-03-03 15:34:54 -05:00
f00231050
591caece0c cri: check fsnotify watcher when receiving cni conf dir events
carry: 612f5f9f44

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2021-03-03 16:46:41 +08:00
Iceber Gu
46fd9e440b
update BUILDMING.md
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-03-03 09:43:52 +08:00
Phil Estes
51992133af
Allow HTTP tracing in push/pull via --trace flag
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-03-02 20:33:35 -05:00
Kevin Parsons
82dccdc490 Update github.com/Microsoft/hcsshim to v0.8.15
Fixes #4915

Release info: https://github.com/microsoft/hcsshim/releases/tag/v0.8.15

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2021-03-02 16:07:40 -08:00
Maksym Pavlenko
134f7a7370
Merge pull request #5007 from fidencio/wip/allow-shimv2-to-also-be-loaded-from-an-arbitrary-path
v2, util: Take the full binary path when starting the shimv2 process
2021-03-01 14:52:27 -08:00
Derek McGowan
52a602190a
Merge pull request #5102 from dims/cleanup-k8s.io/kubernetes-update-aufs-zfs
Update to newest imgcrypt, aufs and zfs
2021-03-01 10:06:43 -08:00
Davanum Srinivas
c3eecf4f75
Update to newest imgcrypt, aufs and zfs
Older versions transitively dragged in k8s.io/kubernetes, the newer
versions do not.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-03-01 12:23:03 -05:00
Phil Estes
54a63a3dd6
Merge pull request #5088 from Iceber/update-linuxkit-readme
update linuxkit readme
2021-03-01 10:23:29 -05:00
Phil Estes
1f801c02ce
Merge pull request #5099 from AkihiroSuda/cache-vagrant
CI: cache ~/.vagrant.d/boxes
2021-03-01 09:53:37 -05:00
Akihiro Suda
4702af9178
CI: cache ~/.vagrant.d/boxes
For deflaking `vagrant up`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-01 15:01:47 +09:00
Akihiro Suda
9ade247b38
overlay: support "userxattr" option (kernel 5.11)
The "userxattr" option is needed for mounting overlayfs inside a user namespace with kernel >= 5.11.

The "userxattr" option is NOT needed for the initial user namespace (aka "the host").

Also, Ubuntu (since circa 2015) and Debian (since 10) with kernel < 5.11 can mount the overlayfs in a user namespace without the "userxattr" option.

The corresponding kernel commit: 2d2f2d7322ff43e0fe92bf8cccdc0b09449bf2e1
> ovl: user xattr
>
> Optionally allow using "user.overlay." namespace instead of "trusted.overlay."
> ...
> Disable redirect_dir and metacopy options, because these would allow privilege escalation through direct manipulation of the
> "user.overlay.redirect" or "user.overlay.metacopy" xattrs.

Fix issue 5060

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-01 13:54:51 +09:00
Iceber Gu
ba199129b6
update linuxkit readme
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-03-01 12:00:56 +08:00
Derek McGowan
10bbd1a462
Merge pull request #5051 from wzshiming/fix/missing-close
Fix missing close
2021-02-26 14:59:43 -08:00
Maksym Pavlenko
46c9746507
Merge pull request #5064 from Iceber/fix-redundant-slice
oci: fix superfluous slice operations
2021-02-26 09:44:50 -08:00
Derek McGowan
07a3ce3d7f
Merge pull request #5080 from dmcgowan/prepare-1.5.0-beta.2
Prepare 1.5.0-beta.2 release
2021-02-26 08:52:27 -08:00
Derek McGowan
9884730e5c
Merge pull request #5069 from AkihiroSuda/restart-fast
restart: skip Sleep() for the first iteration of the reconcilation
2021-02-25 16:37:53 -08:00
Mike Brown
4379557924
Merge pull request #5086 from eramos2/revise-docs
Fixed wording in docs, and broken link
2021-02-25 15:32:25 -06:00
Phil Estes
8dbe53a2a9
Merge pull request #5070 from yoheiueda/empty-masked
cri: set default masked/readonly paths to empty paths
2021-02-25 15:38:45 -05:00
alexyadon
c61f0ceada
Fix broken docs links (#5085)
* docs: fix broken links

Signed-off-by: Alex Yadon <alex.yadon@ibm.com>

* docs: use relative paths

Signed-off-by: Alex Yadon <alex.yadon@ibm.com>
2021-02-25 14:09:49 -06:00
Iceber Gu
f7f6aabfff oci: fix superfluous slice operations
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-02-26 02:35:25 +08:00
Emmanuel Ramos
224efa9dae Fixed wording in docs, and broken link
Signed-off-by: Emmanuel Ramos <emmanuel.ramos2@ibm.com>
2021-02-25 13:18:13 -05:00
Phil Estes
2bc8c779c5
Merge pull request #5068 from AkihiroSuda/restart-test
restart: add an integration test
2021-02-25 12:16:51 -05:00
Michael Crosby
119fe70469
Merge pull request #5071 from AkihiroSuda/restart-parallel
restart: parallelize reconcile()
2021-02-25 11:33:26 -05:00
Phil Estes
7738370db7
Merge pull request #5083 from AkihiroSuda/remove-dep-gocapability
drop dependency on github.com/syndtr/gocapability
2021-02-25 10:48:21 -05:00
Akihiro Suda
7ee610edb5
drop dependency on github.com/syndtr/gocapability
pkg/cap has the full list of the caps (for UT, originally),
so we can drop dependency on github.com/syndtr/gocapability

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-25 15:17:28 +09:00
Akihiro Suda
9822173354
cap: rename FromUint64 to FromBitmap
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-25 15:02:10 +09:00
Akihiro Suda
6ab6eaa790
restart: skip Sleep() for the first iteration of the reconcilation
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-25 13:30:38 +09:00
Akihiro Suda
36df282dcb
restart: add an integration test
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-25 13:30:22 +09:00
Akihiro Suda
b23dc1131e
restart: parallelize reconcile()
The only shared variable `m.client` is thread-safe, so we can safely
parallelize the loops.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-25 13:30:00 +09:00
Derek McGowan
f38a797034
Prepare release notes for 1.5.0-beta.2
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-02-24 08:56:20 -08:00
Yohei Ueda
07f1df4541
cri: set default masked/readonly paths to empty paths
Fixes #5029.

Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
2021-02-24 23:50:40 +09:00
Phil Estes
af4c55fa4a
Merge pull request #5078 from AkihiroSuda/fix-5077
CI: fix "ls: cannot access '/etc/cni/net.d': Permission denied"
2021-02-24 09:01:39 -05:00
Akihiro Suda
b4ef1e9dc7
CI: fix "ls: cannot access '/etc/cni/net.d': Permission denied"
The CI host was probably updated recently and the permission bits of the
directory was changed.

Fix 5077

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-24 19:11:10 +09:00
Phil Estes
757be0a090
Merge pull request #5017 from AkihiroSuda/parse-cap
oci.WithPrivileged: set the current caps, not the known caps
2021-02-23 09:10:57 -05:00
Mike Brown
9173d3e929
Merge pull request #5021 from wzshiming/fix/signal_repeatedly
Fix repeated sending signal
2021-02-22 09:45:56 -06:00
Phil Estes
08d765af95
Merge pull request #5028 from Iceber/runtime-spec
oci: fix the file mode of the device
2021-02-22 09:25:56 -05:00
Fu, Wei
096e99fe7e
Merge pull request #5057 from estesp/moar-time
Tune test timeouts for GH Actions
2021-02-20 10:17:24 +08:00
Phil Estes
13f904cde2
Tune test timeouts for GH Actions
We have enough failures these days; getting timed out when tests are
almost done is the last thing we need :)

On avg. the Linux integration tests are taking 15-17 min, but sometimes
they end up at 20 or a bit over and get canceled. I've seen rare cases
where the Vagrant setup+build+test runs gets very close to 40 min as
well.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-02-19 16:27:43 -05:00
Phil Estes
e58be59cbd
Merge pull request #5054 from jterry75/fix_env_windows
cri: append envs from image config to empty slice to avoid env lost
2021-02-18 20:40:44 -05:00
Justin Terry (SF)
06e4e09567 cri: append envs from image config to empty slice to avoid env lost
Signed-off-by: Justin Terry (SF) <juterry@microsoft.com>
2021-02-18 16:39:28 -08:00
Phil Estes
c32ccdf8be
Merge pull request #5024 from yadzhang/deepcopy-imageconfig
cri: append envs from image config to empty slice to avoid env lost
2021-02-18 12:51:51 -05:00
Phil Estes
d30a6c005f
Merge pull request #5045 from wzshiming/fix/file-not-closed
FIx file is not closed
2021-02-18 12:45:19 -05:00
Shiming Zhang
5e4acc0436 Fix file is not closed
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-02-18 21:38:44 +08:00