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

9038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
d33733f117
Merge pull request #5336 from mxpv/shim 
Decouple shim start from task creation
 2021-04-12 15:10:51 -07: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
Aditi Sharma
4d4117415e Change CRI config runtime options type 
Changing Runtime.Options type to map[string]interface{}
to correctly marshal it from go to JSON.
See issue: https://github.com/kubernetes-sigs/cri-tools/issues/728

Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
 2021-04-08 15:11:33 +05:30
Wei Fu
21ebeef745 integration: use busybox:1.32.0 since latest is unavailable 
```bash
curl -s https://mirror.gcr.io//v2/library/busybox/tags/list | jq '[.tags ]'
[
  [
    "1.26.2",
    "1.27.2",
    "1.28",
    "1.29",
    "1.29.2",
    "1.30",
    "1.30.1",
    "1.31",
    "1.31.0",
    "1.31.1",
    "1.32.0"
  ]
]
```

The latest is gone. I think we should setup image in github container
registry for CI if possible.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-04-08 17:35:08 +08:00
Maksym Pavlenko
1edab60723
Merge pull request #5253 from thaJeztah/refactor_oom 
sys: refactor OOM utilities
 2021-04-07 21:21:44 -07:00
Mike Brown
88880f0f2c
Merge pull request #5304 from mikebrow/cri-registry-doc-updates 
remove mirrors from default; document the deprecation of registry.configs and registry.mirrors
merging based on LGTMs from https://github.com/containerd/containerd/pull/5304#pullrequestreview-628234110 and https://github.com/containerd/containerd/pull/5304#pullrequestreview-630478887 thanks!
 2021-04-07 14:49:36 -05:00
Phil Estes
b52727342c
Merge pull request #5308 from AkihiroSuda/add-imgcrypt-bin 
cri-cni-release: add imgcrypt binaries (v1.1.0)
 2021-04-07 15:43:38 -04:00
Maksym Pavlenko
a4bc81779d
Merge pull request #5312 from AkihiroSuda/expose-WithoutRunMount 
pkg/cri/opts.WithoutRunMount -> oci.WithoutRunMount
 2021-04-07 12:06:10 -07:00
Mike Brown
f9bcf4a8a4 add section link 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-07 12:29:43 -05:00
Mike Brown
d4be6aa8fa rm mirror defaults; doc registry deprecations 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-07 12:29:43 -05:00
Sebastiaan van Stijn
7bb73da6b9
runtime/v2/shim: remove unused SetScore() and remove sys.OOMScoreMaxKillable 
The shim.SetScore() utility was no longer used since 7dfc605fc6.

Checking for uses outside of this repository, I found only one external use of
this in gVisor; a9441aea27/pkg/shim/service.go (L262-L264)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:16:58 +02:00
Sebastiaan van Stijn
91e7d21ee8
sys: add AdjustOOMScore() utility 
Handle the limits in this function so that consumers don't have to
perform the boundary checks.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:16:56 +02:00
Sebastiaan van Stijn
44240116aa
sys: add boundary checks to SetOOMScore() 
Produce a more user-friendly error in the odd case we would try to set a
score out of range

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:16:55 +02:00
Sebastiaan van Stijn
ace1912bba
sys: use assert for error checks in OOM tests 
Slightly easier to read, and we were already using assert in this file

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:16:53 +02:00
Sebastiaan van Stijn
6e72715226
sys: add missing pre-condition checks in tests 
SetOOMScore requires both privileged (root) and non-user namespace,
for negative values, so adjust the pre-conditions accordingly.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:16:51 +02:00
Sebastiaan van Stijn
badd60d3f6
sys: un-export runningPrivileged(), remove runningUnprivileged() 
These are currently only used inside this package, so we might
as well un-export them until we need them elsewhere.

Also updated SetOOMScore() to first check for privileged; check for privileged
looks to be the "faster" path, and checking it first could (in case of non-
privileged) save having to read and parse /proc/self/uid_map.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:16:49 +02:00
Sebastiaan van Stijn
21a175860d
go.mod github.com/klauspost/compress v1.11.13 
full diff: https://github.com/klauspost/compress/compare/v1.11.3...v1.11.13

adds arm64 decompression support, various performance improvements

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-04-07 19:15:59 +02:00
Derek McGowan
8b00eafcaa
Merge pull request #5318 from mikebrow/update-cri-tools-k8s-staging 2021-04-07 09:59:17 -07:00
Mike Brown
58c5fd09e5 re-enable cri test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-07 10:07:32 -05:00
Mike Brown
da998c81eb move to gcr.io/k8s-staging-cri-tools test images 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-04-07 10:04:02 -05:00