github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,943 Commits 3 Branches 4 Tags
2fa4e9c0e212337ff981426d9618fe634fbdff63
Commit Graph

248 Commits

Author SHA1 Message Date
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
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
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
Gabriel Adrian Samfira
1698d061c3 Build volume test images on Windows 
* Adds Windows dockerfile for volume-ownership image
  * Build volume-copy-up on Windows
  * Adds a helper tool that fetches the owner username and SID of
a file or folder
  * Adds README
  * Remove 2004 from Windows versions
  * Add ltsc2022 to Windows versions

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 2021-11-25 09:54:35 +00:00
Takumasa Sakao
2b28dd363b Fix wrong make target on documentation 
Signed-off-by: Takumasa Sakao <sakataku7@gmail.com>
 2021-11-23 03:42:08 +09:00
Derek McGowan
f5863e22f4 Update API version in go.mod 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-11-18 16:21:19 -08:00
Daniel Canter
b103bee4cc go.mod: Bump hcsshim to v0.9.1 
This tag contains some changes for the Windows shim for retrying
stdio named pipe connections if containerd restarts. It also is built with v1.1.0 of
ttrpc which has some fixes for a deadlock we'd observed on Windows.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-11-10 16:26:18 -08:00
Daniel Canter
920b24793d go.mod: Bump ttrpc to 1.1.0 
This tag contains a fix for a deadlock observed when there are multiple
simultaneous requests from the same client connection.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-11-10 10:20:14 -08:00
Sebastiaan van Stijn
97073c9437 go.mod: github.com/moby/sys/mountinfo v0.5.0 
full diff: https://github.com/moby/sys/compare/95edfa939201...mountinfo/v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-11-05 13:10:26 +01:00
Sebastiaan van Stijn
19d9d0d2a5 go.mod: github.com/moby/sys/signal v0.6.0 
full diff: https://github.com/moby/sys/compare/8a51b5cc8879...signal/v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-11-05 13:08:07 +01:00
Sebastiaan van Stijn
9c455ded61 go.mod: github.com/moby/sys/symlink v0.2.0 
full diff: https://github.com/moby/sys/compare/symlink/v0.1.0...symlink/v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-11-05 13:05:38 +01:00
Sebastiaan van Stijn
fa12f4e696 go.mod: golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 
full diff: ed5796bab1...69cdffdb93

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-11-05 13:03:15 +01:00
Maksym Pavlenko
b5b83e0512 Merge pull request #5918 from mxpv/shim-manager 
Decouple task manager
 2021-11-04 16:29:52 +02:00
David Porter
b69bbe25ac Vendor latest k8s.io/cri-api and netlink 
* Bump k8s.io/cri-api to latest version - v0.23.0-alpha.4
* Vendor github.com/vishvananda/netlink for network stats

Signed-off-by: David Porter <porterdavid@google.com>
 2021-11-03 17:52:05 -07:00
Derek McGowan
1e36eaf11f Merge pull request #6200 from bobbypage/restart_integration_test 
test: Add grace period for restart monitor test
 2021-11-03 14:53:09 -07:00
Phil Estes
fd07d74d6d Merge pull request #6179 from claudiubelu/integration/enable-test-runtime-handler 
integration: Enables TestRuntimeHandler for Windows
 2021-11-03 14:14:33 -07:00
David Porter
9bfec3980b test: Add grace period for restart monitor test 
restart monitor test was failing due to occasionally taking past the
deadline on windows tests. Add a small additional grace period to
deflake the test.

Signed-off-by: David Porter <porterdavid@google.com>
 2021-11-03 14:07:11 -07:00
Maksym Pavlenko
6fa1bb4a5c Fix build after rebase 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-11-01 09:22:50 -07:00
Maksym Pavlenko
2cec3a34b1 Migrate task directory 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-11-01 07:37:01 -07:00
Maksym Pavlenko
a3d298193c Fix backward compatibility with old task shims 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-11-01 07:37:01 -07:00
Maksym Pavlenko
7c4ead285d Add task manager 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2021-11-01 07:36:58 -07:00
Claudiu Belu
fb4432c24a integration: Enables TestVolumeCopyUp for Windows 
The image that the test is used for Windows has busybox included,
which means we can use sleep.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-10-07 19:30:42 -07:00
Claudiu Belu
0ba3532f54 integration: Enables TestRuntimeHandler for Windows 
Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-10-07 18:20:59 -07:00
Derek McGowan
d97b40c300 Merge pull request #6085 from claudiubelu/integration/enables-windows-tests 
integration: Enable some tests for Windows
 2021-10-28 13:30:23 -07:00
Claudiu Belu
6020189003 integration: Enable some tests for Windows 
Some of the tests in containerd/integration/client/ are not
currently being run on Windows, even though they can pass.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-10-13 16:04:46 +03:00
Claudiu Belu
830b3c26ec integration: Enable some tests for Windows (part 2) 
Some of the tests that are currently running only on Linux can be made
to run on Windows with a few changes.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-10-07 08:13:01 -07:00
Claudiu Belu
96018b7db9 vendor: Updates go-cni 
This update will allow us to forcefully delete a Windows sandbox if its
endpoint cannot be found anymore.

Fixes: #6135

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-10-06 05:35:53 -07:00
Derek McGowan
0d0fb68589 Merge pull request #6149 from ukontainer/vendor-moby-sys 
vendor: update moby/sys for darwin support
 2021-10-25 15:20:10 -07:00
Hajime Tazaki
b8f3ebb03b vendor: update moby/sys for darwin support 
The mount package of darwin requires to retrive mountinfo to check if
the target of unmount if still mounted or not.  Thus pull the upstreamed
version of moby/sys to support this operation.

Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
 2021-10-23 07:48:17 +09:00
Derek McGowan
45c5298700 Merge pull request #6144 from dmcgowan/prepare-v1.6.0-beta.1 
Prepare v1.6.0-beta.1
 2021-10-22 14:39:38 -07:00
Derek McGowan
37720fc6fd Update api vendor 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-10-22 13:37:45 -07:00
zounengren
a217b5ac8f bump CNI to spec v1.0.0 
Signed-off-by: zounengren <zouyee1989@gmail.com>
 2021-10-22 10:58:40 +08:00
Brian Goff
294143bf38 Inject otel traces to grpc client. 
This uses the global trace provider.
If a trace provider is not set, a no-op provider is used.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2021-10-21 16:08:15 +00:00
zounengren
1f1cad3912 io/ioutil package has been deprecated in Go 1.16 that replaces io/ioutil functions 
Signed-off-by: Zou Nengren <zouyee1989@gmail.com>
 2021-10-13 09:18:31 +08:00
Derek McGowan
63b7e5771e Merge pull request #5973 from Juneezee/deprecate-ioutil 
refactor: move from io/ioutil to io and os package
 2021-10-01 10:52:06 -07:00
Akihiro Suda
fbdcddedc0 Merge pull request #6076 from jonyhy96/cleanup-import 
cleanup: import from k8s.io/utils/clock instead
 2021-10-01 14:18:34 +09:00
haoyun
6484fab1e0 cleanup: import from k8s.io/utils/clock instead 
Signed-off-by: haoyun <yun.hao@daocloud.io>
 2021-09-30 23:27:20 +08:00
haoyun
d16942cf16 feat: enable cri remote client to call with grpc calloptions 
Signed-off-by: haoyun <yun.hao@daocloud.io>
 2021-09-30 23:02:53 +08:00
Kohei Tokunaga
09c9270fee images: enable converter to uncompress zstd 
Currently uncompress converter only supports gzip. This commit fixes it to
support zstd as well.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2021-09-27 11:08:44 +09:00
Phil Estes
5162238c7d Merge pull request #5853 from claudiubelu/integration/windows-hostprocess 
integration: Adds Windows HostProcess tests
 2021-09-26 20:35:00 -04:00
Claudiu Belu
2bc77b8a28 Adds Windows resource limits support 
This will allow running Windows Containers to have their resource
limits updated through containerd. The CPU resource limits support
has been added for Windows Server 20H2 and newer, on older versions
hcsshim will raise an Unimplemented error.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-09-25 13:20:55 -07:00
Derek McGowan
c5947557d8 Add error message to in TestContainerdRestart integration test 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-10-11 08:23:31 -07:00
Derek McGowan
18d483b236 Update cgroups to v1.0.2 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-10-08 17:48:33 -07:00
Derek McGowan
cb6fb93af5 Merge pull request #6011 from crosbymichael/schedcore 
add runc shim support for sched core
 2021-10-08 10:42:16 -07:00
Derek McGowan
60ffa3ff7d Merge pull request #5579 from claudiubelu/integration/restart-containerd 
integration: Enables Windows containerd restart test
 2021-10-08 10:33:10 -07:00
Michael Crosby
f1054dbbde fix integration client vendor 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2021-10-08 16:20:21 +00:00
Daniel Canter
46b152f81b vendor: Bump hcsshim to 0.9.0 
This change bumps hcsshim to 0.9.0. Main thing this tag contains is support for
Kubernetes Host Process containers
See: https://kubernetes.io/docs/tasks/configure-pod-container/create-hostprocess-pod/

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-10-07 21:00:35 -07:00
Phil Estes
e648fa2e81 Merge pull request #5933 from claudiubelu/integration/import-multilayer 
integration: Adds test for multilayer image import
 2021-10-07 14:09:25 -04:00
Derek McGowan
2d48b6a864 Merge pull request #6031 from fuweid/carry-5648 
runtime: should fail fast if dial error on shim
 2021-10-07 09:43:10 -07:00
zounengren
3a713811be run gofmt with Go 1.17 
Signed-off-by: Zou Nengren <zouyee1989@gmail.com>
 2021-10-07 20:16:59 +08:00