Commit Graph

9017 Commits

Author SHA1 Message Date
Phil Estes
c55492f8de
Update to Go 1.16.1
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-03-11 09:03:09 -05:00
Akihiro Suda
ee84e85758
deflake TestRestartMonitor
Fix #5146

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-11 15:34:19 +09:00
Fu, Wei
2b1e913679
Merge pull request #5156 from estesp/step-name
CI: Add a name for the vagrant up step
2021-03-11 10:45:40 +08:00
Phil Estes
c9c7665bba
CI: Add a name for the vagrant up step
Without a name the logs use a carriage return followed by the long
comment as the name of the job step which is messy when working with the
actions API/logs.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-03-10 14:48:01 -05:00
Phil Estes
95513021e0
Merge pull request #5150 from thaJeztah/update_mountinfo
go.mod: github.com/moby/sys/mountinfo v0.4.1
2021-03-10 13:08:23 -05:00
Sebastiaan van Stijn
d629a08ebf
go.mod: github.com/moby/sys/mountinfo v0.4.1
full diff: https://github.com/moby/sys/compare/mountinfo/v0.4.0...mountinfo/v0.4.1

Fixes and improvements:

- Fix PrefixFilter() being too greedy
- TestMountedBy*: add missing pre-checks
- Documentation improvements

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-10 14:31:33 +01:00
Sebastiaan van Stijn
79a51cd16a
move runc version to a separate file for easier consumption
This moves the runc version to build to scripts/setup/runc-version,
which makes it easier for packagers to find the default version
to use.

The RUNC_VERSION environment variable can still be used to override
the version, which can be used (e.g.) to test against different versions
in our CI.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-10 14:28:29 +01:00
Sebastiaan van Stijn
8325ba5d36
Separate runc binary version from libcontainer version
Now that the dependency on runc (libcontaienr) code has been reduced
considerably, it is probbaly ok to cut the version dependency between
libcontainer and the runc binary that is supported.

This patch separates the runc binary version from the version of
libcontainer that is defined in go.mod, and updates the documentation
accordingly.

The RUNC_COMMIT variable in the install-runc script is renamed to
RUNC_VERSION to encourage using tagged versions, and the Dockerfile
in contrib is updated to allow building with a custom version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-10 13:41:12 +01:00
Sebastiaan van Stijn
b89a63a235
Remove references to apparmor and selinux buildtags for runc
From the runc v1.0.0-rc93 release notes:

> The "selinux" and "apparmor" buildtags have been removed, and now all runc
> builds will have SELinux and AppArmor support enabled. Note that "seccomp"
> is still optional (though we very highly recommend you enable it).

Also adding a note about kmem support.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-10 12:16:54 +01:00
Phil Estes
17ab5dd08c
Merge pull request #5114 from alakesh/print-unpack-time
Print elapsed time for image unpack
2021-03-09 22:41:16 -05:00
Derek McGowan
ddf6594fbe
Merge pull request #5076 from AkihiroSuda/ovl-k511
overlay: support "userxattr" option (kernel 5.11)
2021-03-09 07:07:30 -08:00
Alakesh Haloi
9f5244f410 Print elapsed time for image unpack
The provides additional insight into how much time is being spent in
unpacking and is helpful in performance comparison for just this stage
without resorting to running under time command in linux for example.

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-03-09 06:40:49 +00:00
Fu, Wei
a5d17eb507
Merge pull request #5143 from kevpar/fix-lookpath
Fix error checking when resolving shim binary path
2021-03-09 12:01:22 +08:00
Akihiro Suda
9ec2778950
Merge pull request #4467 from cyphar/apparmor-update-profile
apparmor: handle signal mediation
2021-03-09 10:55:01 +09:00
Kevin Parsons
c9afc4250a Fix error checking when resolving shim binary path
Previously a typo was introduced that caused the wrong error to be
checked against when calling exec.LookPath. This had the effect that
containerd would never locate the shim binary if it was in the same
directory as containerd's binary, but not in PATH.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2021-03-08 16:24:19 -08:00
Mike Brown
6d68490ef6
Merge pull request #5014 from Iceber/update-pause-version
move to v3.4.1 for the pause image
2021-03-08 15:48:03 -06:00
Mike Brown
185aaf2070
Merge pull request #5141 from dims/create-symlink-to-avoid-duplicating-files-in-cloud-init
Create symlink to avoid duplicate cloud init
2021-03-08 15:31:02 -06:00
Derek McGowan
f6a07f4440
Merge pull request #5140 from mxpv/reader
Add OpenReader to local store
2021-03-08 13:13:10 -08:00
Davanum Srinivas
c193e121f9
Create symlink to avoid duplicate cloud init
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-03-08 15:52:59 -05:00
Maksym Pavlenko
571cc32df6 Add OpenReader to create ReaderAt interface
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-03-08 12:04:58 -08:00
Michael Crosby
7738246cd9
Merge pull request #5111 from ctrlaltdel121/master
mark device faulty after parent fails to suspend
2021-03-08 14:13:25 -05:00
Michael Crosby
da137a7a1f
Merge pull request #5134 from AkihiroSuda/dump-apparmor
apparmor: add DumpDefaultProfile
2021-03-08 13:33:40 -05:00
Akihiro Suda
0580bd6990
apparmor: add DumpDefaultProfile
This function will be used by nerdctl for printing the default AppArmor
profile: `nerdctl system inspect apparmor-profile`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-08 17:28:03 +09:00
Iceber Gu
f37ae8fc35
move to v3.4.1 for the pause image
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-03-07 15:21:20 +08:00
Mike Brown
a72fe7da21
Merge pull request #5106 from Iceber/update-building-readme
update BUILDING.md
2021-03-05 16:31:29 -06:00
Fu, Wei
4514bc9c5c
Merge pull request #5127 from dmcgowan/update-release-md
Update RELEASES.md to reflect latest releases
2021-03-05 15:07:54 +08:00
Derek McGowan
aa8448a285
Update RELEASES.md to reflect latest releases
Mark 1.3 as end of life as of the 1.3.10 release on March 4th.
Update 1.4 to latest release.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-03-04 22:10:24 -08:00
Derek McGowan
02334356d0
Merge pull request #5120 from dmcgowan/1.5-release-notes-update
Prepare release notes for 1.5.0-beta.3
2021-03-04 21:35:46 -08:00
Derek McGowan
9ba531c316
Prepare release notes for 1.5.0-beta.3
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-03-04 20:44:43 -08:00
Derek McGowan
8e20726618
Merge pull request #5095 from dims/fix-pull-containerd-node-e2e-failure
Fix pull-containerd-node-e2e failure on master
2021-03-04 20:42:51 -08:00
Mike Brown
fa66f93c0c
Merge pull request #5117 from Iceber/fix-container-status
cri: fix container status
2021-03-04 10:27:49 -06:00
Iceber Gu
92ab1a63b0 cri: fix container status
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-03-05 00:00:10 +08:00
Phil Estes
498eebe860
Merge pull request #5123 from fuweid/update-bug-report-template
.github: update bug_report.md with hint and tip
2021-03-04 09:05:03 -05:00
Wei Fu
34e8385815 .github: update bug_report.md with hint and tip
Since both cri-containerd and runC runtime are widely used, the relevent
information should include runC and CRI configuration when file bug.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2021-03-04 20:20:41 +08:00
Fu, Wei
bb3fcf62f1
Merge pull request #5119 from mxpv/dm
Remove flaky devmapper check
2021-03-04 10:36:07 +08:00
Davanum Srinivas
15a4df0ba9
fix names and paths for containerd master
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-03-03 21:27:28 -05:00
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