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

11435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gabriel Adrian Samfira
323a62d7b9
Add permissions 
Limit the scope of GITHUB_TOKEN to only have write access to packages
and read access to metadata. By default it seems to be granted access
equal to that of the github.actor that triggered the workflow, which
may include access to more than the workflow needs.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-02 18:28:51 +02:00
Sebastiaan van Stijn
f3195b3b51
export oci.DeviceFromPath() 
This will help to reduce the amount of runc/libcontainer code that's used in
Moby / Docker Engine (in favor of using the containerd implementation).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-12-02 17:17:12 +01:00
Phil Estes
16c233b6d7
Merge pull request #6306 from thaJeztah/update_oci_getdevices 
oci/deviceFromPath(): correctly check device types
 2021-12-02 10:51:43 -05:00
Gabriel Adrian Samfira
c6d26f0d37
Authenticate against ghcr.io 
This change adds a login step that authenticates the runner to
ghcr.io. This allows whomever triggers the action to use github
packages as a destination for the container images.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-12-02 17:41:54 +02:00
Akihiro Suda
30d8dccd3d
Merge pull request #6315 from dcantah/skip-multilayertest-windows 
Skip TestExportAndImportMultiLayer on Windows
 2021-12-02 21:13:54 +09:00
Daniel Canter
2a6857d060 Skip TestExportAndImportMultiLayer on Windows 
This change skips the TestExportAndImportMultiLayer in integration/client
for the time being. It seems the image was updated recently and no longer
has a Windows entry in the manifest so the test will always fail. This should
be reverted when we figure out what happened to the image, but this is to
unblock PRs for the time being.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-12-01 16:58:52 -08:00
ningmingxiao
6ff1a59345
fix when kernel version < 4.13rc1 by using index=off cause overlay test error 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2021-12-01 21:48:52 +08:00
Sebastiaan van Stijn
94462d8f5d
oci/deviceFromPath(): correctly check device types 
This ports the changes of 95a59bf206
to this repository.

From that PR:

    (mode&S_IFCHR == S_IFCHR) is the wrong way of checking the type of an
    inode because the S_IF* bits are actually not a bitmask and instead must
    be checked using S_IF*. This bug was neatly hidden behind a (major == 0)
    sanity-check but that was removed by [1].

    In addition, add a test that makes sure that HostDevices() doesn't give
    rubbish results -- because we broke this and fixed this before[2].

    [1]: 24388be71e ("configs: use different types for .Devices and .Resources.Devices")
    [2]: 3ed492ad33 ("Handle non-devices correctly in DeviceFromPath")

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-12-01 13:21:34 +01:00
Derek McGowan
591d7097e7
Merge pull request #6290 from gabriel-samfira/add-test-image-build-action 
Integration: Add image build workflow
 2021-11-30 13:51:24 -08:00
Maksym Pavlenko
f419d4a0ac
Merge pull request #6286 from aznashwan/windows-integration-separate-trigger 
Integration: Separate Windows Periodic Tests workflow trigger.
 2021-11-30 12:41:04 -08:00
Phil Estes
3d1c85d954
Merge pull request #6274 from gabriel-samfira/build-image-on-windows 
Build volume test images on Windows
 2021-11-30 09:49:08 -05:00
Phil Estes
2a36dcdda3
Merge pull request #6297 from adisky/patch-2 
Add VMware TKG & TCE to Containerd adopters
 2021-11-30 09:45:21 -05:00
Aditi Sharma
7a4415dd57 Add VMware TKG & TCE to Containerd adopters 
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
 2021-11-30 12:29:19 +05:30
Derek McGowan
8757b92c76
Merge pull request #6293 from AkihiroSuda/fedora35 
Vagrantfile: update to Fedora 35
 2021-11-29 09:28:16 -08:00
Mike Brown
1fe214c22a
Merge pull request #6269 from estesp/test-ci-readme 
Update README.md repo->org
 2021-11-29 08:42:29 -06:00
Akihiro Suda
46892d3408
Vagrantfile: update to Fedora 35 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-11-29 16:13:32 +09:00
Akihiro Suda
2877865a94
Merge pull request #6278 from mxpv/resolve 
Fix executable file not found when restoring shims
 2021-11-29 13:33:12 +09:00
Maksym Pavlenko
9e7910ebdc
Merge pull request #6271 from fuweid/move_stdout_to_stderr 
ctr/snapshots/diff: show media-type in stderr
 2021-11-28 11:29:21 -08:00
Maksym Pavlenko
0d720ff9c9
Merge pull request #6289 from ManaSugi/add-ctr-caps 
ctr: Add Linux Capabilities control flags
 2021-11-28 11:26:50 -08:00
Maksym Pavlenko
7cfccdbad6
Merge pull request #6270 from fuweid/enhance_test_case 
integration: add stats result in error message
 2021-11-28 11:23:37 -08:00
Wei Fu
8de1117c99 integration: add stats result in error message 
```
// from  https://github.com/containerd/containerd/pull/6150#issuecomment-974747473

container_stats_test.go:364:
        	Error Trace:	container_stats_test.go:364
        	Error:      	Received unexpected error:
        	            	unexpected stats length
        	            	github.com/containerd/containerd/integration.TestContainerListStatsWithIdSandboxIdFilter.func4
        	            		/home/runner/work/containerd/containerd/integration/container_stats_test.go:371
        	            	github.com/containerd/containerd/integration.Eventually
        	            		/home/runner/work/containerd/containerd/integration/main_test.go:324
        	            	github.com/containerd/containerd/integration.TestContainerListStatsWithIdSandboxIdFilter
        	            		/home/runner/work/containerd/containerd/integration/container_stats_test.go:364
        	            	testing.tRunner
        	            		/opt/hostedtoolcache/go/1.17.3/x64/src/testing/testing.go:1259
        	            	runtime.goexit
        	            		/opt/hostedtoolcache/go/1.17.3/x64/src/runtime/asm_amd64.s:1581
        	Test:       	TestContainerListStatsWithIdSandboxIdFilter
```

Add stats result for the purpose of debug.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-11-28 16:57:40 +08:00
Wei Fu
6681cc4b94 ctr/snapshots/diff: don't show the media-type in output 
By default, diff subcommand will print tar(.gz) on stdout. If we print
the media-type in stdout, the output will create invalid tar(.gz) data.

```
// before
➜  containerd git:(move_stdout_to_stderr) sudo ctr snapshot diff sha256:9f54eef412758095c8079ac465d494a2872e02e90bf1fb5f12a1641c0d1bb78b > /tmp/1.tar
➜  containerd git:(move_stdout_to_stderr) file /tmp/1.tar
/tmp/1.tar: data

// after change
➜  containerd git:(move_stdout_to_stderr) make bin/ctr
+ bin/ctr
➜  containerd git:(move_stdout_to_stderr) sudo bin/ctr snapshot diff sha256:9f54eef412758095c8079ac465d494a2872e02e90bf1fb5f12a1641c0d1bb78b > /tmp/2.tar

➜  containerd git:(move_stdout_to_stderr) file /tmp/2.tar
/tmp/2.tar: gzip compressed data, original size modulo 2^32 75155456
```

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2021-11-28 10:38:42 +08:00