github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,056 Commits 3 Branches 2 Tags 112 MiB
824b61075f
Commit Graph

9056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
824b61075f
Merge pull request #5350 from thaJeztah/tagged_go_winio 
go.mod: github.com/Microsoft/go-winio v0.4.17
 2021-04-13 20:29:44 -07:00
Derek McGowan
06dcac501f
Merge pull request #5349 from thaJeztah/use_tagged_imgcrypt 
go.mod: github.com/containerd/imgcrypt v1.1.1
 2021-04-13 20:29:11 -07:00
Sebastiaan van Stijn
ee34caccb3
go.mod: github.com/Microsoft/go-winio v0.4.17 
no code changes as this is the same commit, but now tagged:

https://github.com/Microsoft/go-winio/compare/5516f17a5958...v0.4.17

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-13 23:56:53 +02:00
Sebastiaan van Stijn
d478676d35
go.mod: github.com/containerd/imgcrypt v1.1.1 
No code changes other than an updated changelog, and updating to
the tagged v1.1.1:

diff: https://github.com/containerd/imgcrypt/compare/0bed51b9522c...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-13 23:41:44 +02:00
Derek McGowan
f968359ecb
Merge pull request #5346 from dmcgowan/prepare-1.5.0-rc.1 
Prepare 1.5.0-rc.1 release
 2021-04-13 08:26:43 -07:00
Phil Estes
2305f05045
Merge pull request #5307 from maoyangLiu/fix-url 
fix the 404 link in docs/cri/config.md
 2021-04-13 10:34:26 -04:00
maoyangLiu
abd4be07ac fix the 404 url 
Signed-off-by: maoyangLiu <liumaoyang@inspur.com>
 2021-04-13 20:55:26 +08:00
Phil Estes
984aa330da
Merge pull request #5316 from alakesh/stress-snapshotter-cli-option 
Add snapshotter cli option to containerd-stress utility
 2021-04-13 08:28:50 -04:00
Derek McGowan
978ebbef64
Prepare 1.5.0-rc.1 release 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-04-12 22:01:49 -07:00
Phil Estes
68ee827dcd
Merge pull request #5342 from mikebrow/improve-error-out-for-bad-config 
address recent runtimes config confusion
 2021-04-12 20:40:10 -04:00
Phil Estes
a20213a6ea
Merge pull request #5343 from thaJeztah/update_imgcrypt 
go.mod: github.com/containerd/imgcrypt v1.1.1-0.20210412181126-0bed51b9522c
 2021-04-12 20:39:18 -04:00
Phil Estes
b7c8136901
Merge pull request #5283 from alakesh/check-out-of-space 
devmapper: log pool status when mkfs fails
 2021-04-12 20:37:13 -04:00
Sebastiaan van Stijn
ce116d4c59
go.mod: github.com/containerd/imgcrypt v1.1.1-0.20210412181126-0bed51b9522c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-13 01:06:38 +02:00
Derek McGowan
5dde642fda
Merge pull request #5344 from thaJeztah/update_cni_plugins 
go.mod: github.com/containernetworking/plugins v0.9.1
 2021-04-12 15:12:31 -07:00
Derek McGowan
d33733f117
Merge pull request #5336 from mxpv/shim 
Decouple shim start from task creation
 2021-04-12 15:10:51 -07:00
Alakesh Haloi
0550c32330 containerd-stress: add snapshotter option for stress test to use 
containerd-stress utility needs to be able to run with snapshotter
passed by user in cli in order to be able to stress test snapshotters.
This adds a cli option --snapshotter="<snapshotter-name>"

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
 2021-04-12 20:45:22 +00:00
Mike Brown
8a04bd0521 address recent runtimes config confusion 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-12 15:33:38 -05:00
Sebastiaan van Stijn
c4778fe1b1
go.mod: github.com/containernetworking/plugins v0.9.1 
full diff: https://github.com/containernetworking/plugins/compare/v0.8.6...v0.9.1

changes in vendored code:

- (in containernetworking/plugins): Fix race condition in GetCurrentNS
- (in containernetworking/cni): tighten up plugin-finding logic

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-12 22:10:06 +02:00
Alakesh Haloi
5ce35ac398 devmapper: log pool status when mkfs fails 
If mkfs on device mapper thin pool fails, it will show pool status
as returned by dmsetup for enahnced error reporting.

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
 2021-04-12 19:24:04 +00:00
Akihiro Suda
054a3e281e
Merge pull request #5335 from dims/drop-support-for-version-1 2021-04-13 04:11:04 +09:00
Davanum Srinivas
75097b8cac
hcsshim seems to have been updated 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2021-04-12 13:23:33 -04:00
Davanum Srinivas
9ad087947d
Switch all our tests to version 2 
Also warn when someone uses version 1

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2021-04-12 13:18:33 -04:00
Derek McGowan
2a2d779594
Merge pull request #5337 from mxpv/bolt 
Add more bolt utils
 2021-04-12 09:56:56 -07:00
Michael Crosby
187affc9be
Merge pull request #5338 from AkihiroSuda/console-102 
go.mod: github.com/containerd/console v1.0.2
 2021-04-12 12:56:42 -04:00
Justin
d4fbff113d
Merge pull request #4399 from TBBle/wcow_compare_layers_to_tar 
Implement windowsDiff.Compare to allow outputting OCI images
 2021-04-12 09:49:50 -07:00
Mike Brown
6bf77c5eb1
Merge pull request #5341 from containerd/revert-5303-cri-remove-deprecated-default-untrusted 
Revert "remove two very old no longer used runtime options"
 2021-04-12 11:35:00 -05:00
Maksym Pavlenko
ff2cf56e58
Merge pull request #5339 from AkihiroSuda/crun-019 
CI: update crun to 0.19
 2021-04-12 08:46:15 -07:00
Mike Brown
e96d2a5d90 Revert "remove two very old no longer used runtime options" 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-12 10:16:01 -05:00
Akihiro Suda
14f357b90f
CI: update crun to 0.19 
Release notes: https://github.com/containers/crun/releases

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-04-12 17:05:11 +09:00
Akihiro Suda
2943310602
go.mod: github.com/containerd/console v1.0.2 
Contains fix for s390x and support for FreeBSD

https://github.com/containerd/console/compare/v1.0.1...v1.0.2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-04-12 15:58:08 +09:00
Fu, Wei
7e3fd8da24
Merge pull request #5298 from jsturtevant/issue-5297 
Support multi-arch images for Windows via ctr
 2021-04-12 13:52:14 +08:00
Maksym Pavlenko
bb6c0c2de7 Add more bolt utils 
This PR extracts out a few more bolt utils from the codebase for easier management.

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-04-11 19:32:46 -07:00
Maksym Pavlenko
0ad8c0a169 Decouple shim start from task creation 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-04-11 18:51:27 -07:00
Derek McGowan
2486eb8ff8
Merge pull request #5326 from thaJeztah/bump_hcsshim 
go.mod: github.com/Microsoft/hcsshim v0.8.16
 2021-04-09 18:05:17 -07:00
Paul "TBBle" Hampson
c7504987e6 Implement windowsDiff.Compare via hcsshim/pkg/ociwclayer 
This parallels the implementation of windowsDiff.Apply, including
bouncing very briefly though archive.WriteDiff and then straight back
out into Windows-specific code.

It's mostly pulling existing mechanisms from non-Windows Compare or
Windows Apply, and highlights that there's probably a lot of scope for
refactoring on top of this.

Now the export-related integration tests pass CI on Windows.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2021-04-10 02:02:33 +10:00
Paul "TBBle" Hampson
a64a76846c Replace inline applyWindowsLayer using hcsshim 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2021-04-10 02:02:33 +10:00
Paul "TBBle" Hampson
149fa366f9 Don't tease the logger with a %-less format string 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2021-04-10 02:02:33 +10:00
Paul "TBBle" Hampson
b399e2ef6d Don't lose Compare failure if aborting diff upload fails 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2021-04-10 02:02:33 +10:00
Sebastiaan van Stijn
36bf3f0e8a
go.mod: github.com/Microsoft/hcsshim v0.8.16 
full diff: https://github.com/microsoft/hcsshim/compare/v0.8.15...v0.8.16

also updating github.com/Microsoft/hcsshim/test to current master

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-09 09:12:12 +02:00
Derek McGowan
6636e36182
Merge pull request #5257 from dmcgowan/prepare-1.5.0-rc.0 
Prepare v1.5.0-rc.0
 2021-04-08 22:30:44 -07:00
Derek McGowan
8e1a8ecd80
Prepare v1.5.0-rc.0 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-04-08 21:49:12 -07:00
Fu, Wei
d064140369
Merge pull request #5302 from mikebrow/toml-cri-defaults 
shows our runc.v2 default options
 2021-04-09 11:11:25 +08:00
Derek McGowan
01a39262e8
Merge pull request #5324 from thaJeztah/no_libcontainer_devices 
cri/server: use containerd/oci instead of libcontainer/devices (remove libcontainer/devices dependency)
 2021-04-08 16:32:08 -07:00
Sebastiaan van Stijn
9bc8d63c9f
cri/server: use containerd/oci instead of libcontainer/devices 
Looks like we had our own copy of the "getDevices" code already, so use
that code (which also matches the code that's used to _generate_ the spec,
so a better match).

Moving the code to a separate file, I also noticed that the _unix and _linux
code was _exactly_ the same (baring some `//nolint:` comments), so also
removing the duplicated code.

With this patch applied, we removed the dependency on the libcontainer/devices
package (leaving only libcontainer/user).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-08 23:25:21 +02:00
Mike Brown
dd16b006e5 merge in the move to the new options type 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-08 14:09:59 -05:00
Mike Brown
9144ce9677 shows our runc.v2 default options in the containerd default config 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-08 14:09:59 -05:00
Michael Crosby
ceb08756a4
Merge pull request #5321 from thaJeztah/fix_oom_score_test 
fix TestSetOOMScoreBoundaries and replace missing busybox image in CI
 2021-04-08 14:54:50 -04:00
Derek McGowan
1645db33df
Merge pull request #5305 from thaJeztah/update_klauspost_compress 
go.mod github.com/klauspost/compress v1.11.13
 2021-04-08 11:30:41 -07:00
Mike Brown
7648ad289b
Merge pull request #5300 from adisky/fix-toml 
Change the type of CRI runtime option
 2021-04-08 10:14:45 -05:00
Sebastiaan van Stijn
3d20fa9309
fix TestSetOOMScoreBoundaries 
(this was introduced in 44240116aa)

Setting the oom-score-adj to -1000 is only possible if the parent process
either has no score set, or if the score is set to -1000.

However, the current implementation of GetOOMScoreAdj conflates situations
where either _no_ oom-score is set, _or_ oom-score is set, but set to 0.

In the latter case, the test would fail:

    --- FAIL: TestSetOOMScoreBoundaries (0.01s)
        oom_linux_test.go:79: assertion failed: 0 (adjustment int) != -1000 (OOMScoreAdjMin int)
    FAIL

To prevent failures in this situation, skip that part of the test in the
above situation.

Also update the description of GetOOMScoreAdj to clarify its behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-08 13:14:04 +02:00