github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
11,307 Commits 3 Branches 2 Tags 112 MiB
99acefaad9
Commit Graph

11307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
2c96d5b067
Run windows parallel integration test as short 
This prevents tests which spawn daemons from running at
the same time as the first integration test.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-12-09 11:45:38 -08:00
Derek McGowan
807213fd32
Update restart monitor test to output daemon logs on failure 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-12-09 11:45:37 -08:00
Phil Estes
26d356d09d
Merge pull request #6263 from thaJeztah/bump_oci_specs 
go.mod: update image-spec to latest (v1.0.3-dev)
 2021-12-09 13:26:20 -05:00
Michael Crosby
9b0303913f
only relabel cri managed host mounts 
Co-authored-by: Samuel Karp <skarp@amazon.com>
Signed-off-by: Michael Crosby <michael@thepasture.io>
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2021-12-09 09:53:47 -08:00
Sebastiaan van Stijn
90cdc6c9a6
images/converter: remove deprecated types 
Removes the, now obsolete structs/types:

- DualIndex
- DualManifest
- ObjectWithMediaType

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-12-09 17:50:12 +01:00
Sebastiaan van Stijn
fc8138468f
go.mod: update image-spec to latest (v1.0.3-dev) 
The OCI image spec did a v1.0.2 security release for CVE-2021-41190, however
commit 09c9270fee, depends on MediaTypes that
have not yet been released by the OCI image-spec, so using current "main" instead.

full diff: 5ad6f50d62...693428a734

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-12-09 17:50:09 +01:00
Sebastiaan van Stijn
2d3009038c
cri/server: use consistent alias for pkg/ioutil 
Consistently use cioutil to prevent it being confused for Golang's ioutil.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-12-09 17:47:22 +01:00
Phil Estes
a04656c1dd
Merge pull request #6353 from mxpv/gids 
Skip WithAdditionalGIDs on Darwin
 2021-12-08 11:57:25 -05:00
Derek McGowan
f9cfadcdd2
Merge pull request #6303 from jsturtevant/fix-rg-timestamp 
Use RFC3339 format on Windows periodic resource group creation so cleanup works
 2021-12-08 08:41:35 -08:00
Alakesh Haloi
dc13bcd51e Enable lazy init for ext4 with devicemapper 
Add file system options for config file, so that user can use
non-default file system parameters for the fs type of choice
Using file system options in config file overwrites the default
options already being used.

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
 2021-12-07 13:32:32 -08:00
James Sturtevant
68dabdcc69 Use RFC3339 format so rg cleanup works 
Signed-off-by: James Sturtevant <jstur@microsoft.com>
 2021-12-07 11:04:36 -08:00
Nashwan Azhari
6f9d80907e Remove Windows integration testing for 2004. 
Considering Windows 2004's EoL on the 14th of December, 2021,
this PR removes all periodic integration testing for 2004.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
 2021-12-07 19:49:33 +02:00
Gabriel Adrian Samfira
77a321a073 Replace find with native Go code 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-07 11:04:38 +00:00
Gabriel Adrian Samfira
22dc60e059 Enable TestVolumeOwnership on Windows 
This change enables the TestVolumeOwnership on Windows. The test
assumes that the volume-ownership image is built on Windows, thus
ensuring that Windows file security info (ACLs and ownership info)
are attached to the C:\volumes\test_dir path.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-07 10:47:13 +00:00
Maksym Pavlenko
441bcb56d7 Skip WithAdditionalGIDs on Darwin 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-12-06 14:26:43 -08:00
Kazuyoshi Kato
4c1e26cd5b Don't fail-fast on Windows integration tests 
As like other integration tests, Windows integration tests should not
fail-fast. So developers can see whether an issue is platform-specific
or not.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-12-06 10:56:33 -08:00
Derek McGowan
753f95e23f
Merge pull request #6330 from AkihiroSuda/runc-1.0.3 
update runc to v1.0.3
 2021-12-06 10:54:53 -08:00
Derek McGowan
1c32c00fe7
Merge pull request #6329 from mxpv/mac 
Diff apply native snapshotter on Darwin
 2021-12-06 10:29:56 -08:00
ningmingxiao
54e95e6b88
fix Implicit memory aliasing in for loop 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2021-12-06 21:36:31 +08:00
Akihiro Suda
c9d1e155c7
go.mod: github.com/opencontainers/runc v1.0.3 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-12-06 15:12:22 +09:00
Akihiro Suda
44995d4831
update runc binary to v1.0.3 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-12-06 15:06:39 +09:00
Maksym Pavlenko
416899fc8e Allow native snapshotter on Darwin 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-12-04 14:08:09 -08:00
Fu Wei
292b0c1561
Merge pull request #6328 from kzys/go-install 
Do not use `go get` to install executables
 2021-12-04 11:28:56 +08:00
Fu Wei
4af023480f
Merge pull request #6326 from mxpv/builtins 2021-12-04 08:33:03 +08:00
Kazuyoshi Kato
6b0e2414c8 Do not use go get to install executables 
https://go.dev/doc/go-get-install-deprecation

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-12-03 14:56:33 -08:00
Maksym Pavlenko
d2f1dda0f1 Include runtime v2 in default builtins 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-12-03 11:30:03 -08:00
Maksym Pavlenko
d06bce4d3d
Merge pull request #6314 from dcantah/ws2022-ci 
Add Windows Server 2022 CI runs
 2021-12-03 10:51:00 -08:00
Kazuyoshi Kato
5d4dc57802 remotes/docker: log registry URLs as info instead of debug 
Registry URLs are important and should be logged even the logging level is
info.

Fixes #5486.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-12-03 10:44:05 -08:00
Phil Estes
d742453086
Merge pull request #6324 from gabriel-samfira/set-explicit-acl 
Set explicit ACL on test files
 2021-12-03 13:14:04 -05:00
Phil Estes
2c1f517811
Merge pull request #6311 from thaJeztah/update_test_image 
integration: align tags of test images
 2021-12-03 13:12:27 -05:00
Derek McGowan
0721777960
Merge pull request #6325 from gabriel-samfira/set-containerd-root 
Set CONTAINERD_ROOT in Windows cri-integration
 2021-12-03 09:07:04 -08:00
Phil Estes
e0e605cf39
Merge pull request #6312 from thaJeztah/export_DeviceFromPath 
export oci.DeviceFromPath()
 2021-12-03 11:47:31 -05:00
Gabriel Adrian Samfira
392f604eba
Use a single RUN command 
Run test file creation in single RUN command.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-03 18:10:39 +02:00
Danielle Lancashire
533dd1c0ee fixup: check for swap accounting 
Signed-off-by: Danielle Lancashire <dani@builds.terrible.systems>
 2021-12-03 16:04:01 +01:00
Sebastiaan van Stijn
f33d38c7cb
integration: align tags of test images 
I noticed we were using some different versions of the same test
images, so changing them to be the same (can help with find/replace
if we need to update them).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-12-03 15:14:09 +01:00
Danielle Lancashire
c5b0a18b6e fixup: handle diff between cgroupsv1 and v2 
Signed-off-by: Danielle Lancashire <dani@builds.terrible.systems>
 2021-12-03 14:35:00 +01:00
Gabriel Adrian Samfira
9cc0d1f073
Set explicit ACL on test files 
It seems that the default ACLs inherited from the parent folder
on Windows Server 2022, does not include "CREATOR OWNER" as it
does on Windows Server 2019. This sets explicit ACLs on test
files.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-03 14:16:28 +02:00
Gabriel Adrian Samfira
4ccf287da7
Set CONTAINERD_ROOT in Windows cri-integration 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-03 07:44:44 +02:00
Maksym Pavlenko
106086d65a
Merge pull request #6321 from gabriel-samfira/update-volume-test-images 
Update volume test images
 2021-12-02 16:43:05 -08:00
Daniel Canter
ff77dd1121 Add Windows Server 2022 CI runs 
GA for ws2022 github actions VMs launched a couple weeks ago so seems like
it's time to try out the CI on this new SKU.

This involved adding new ws2022 runs for the OS matrices in the CI, fixing up
a test in the platforms package and adding a mapping for the ws2022 container image in
integration/client.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-12-02 16:18:25 -08:00
Gabriel Adrian Samfira
fd0850e9ef
Update continuity dependency 
This change ensures that Windows security info is
copied.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-03 00:26:45 +02:00
Gabriel Adrian Samfira
ff9d7aef32
Update volume test images 
Update volume test images to version 2.1. This enables Windows
volume tests.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-03 00:02:45 +02:00
Phil Estes
08812f3fb7
Merge pull request #6201 from dmcgowan/test-restart-monitor-check-timestamp 
Update TestRestartMonitor expected time check
 2021-12-02 15:30:27 -05:00
Danielle Lancashire
2fa4e9c0e2 cri: add support for configuring swap 
Signed-off-by: Danielle Lancashire <dani@builds.terrible.systems>
 2021-12-02 21:25:33 +01:00
Phil Estes
8063fdab08
Merge pull request #6319 from dmcgowan/update-windows-integration-image-to-ghcr 
Move test volume images from gcr to ghcr
 2021-12-02 15:02:22 -05:00
Derek McGowan
bae0d88ae7
Add error logging on cleanup 
Check the errors for task and container deletion during restart test
cleanup.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-12-02 11:47:14 -08:00
Maksym Pavlenko
d43a90b984
Merge pull request #6301 from mxpv/migration 
Revert shim service plugin migration
 2021-12-02 11:11:39 -08:00
Maksym Pavlenko
6bccd67e84 Revert shim plugin migration 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-12-02 10:35:15 -08:00
Derek McGowan
665877a5bf
Move volume images from gcr to ghcr 
With the ghcr images now built and working, switch over to
use these new images and update the default name.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-12-02 10:29:44 -08:00
Derek McGowan
2190192b54
Merge pull request #6317 from gabriel-samfira/add-github-packages-login 
Authenticate against ghcr.io
 2021-12-02 09:17:37 -08:00