github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
13,508 Commits 3 Branches 4 Tags
4c775fcfbf13a55d985d431a6c96120286e0b291
Commit Graph

35 Commits

Author SHA1 Message Date
Maksym Pavlenko
bbac058cf3 Move CRI from pkg/ to internal/ 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2024-02-02 10:12:08 -08:00
Derek McGowan
261e01c2ac Move client to subpackage 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-11-01 10:37:00 -07:00
Derek McGowan
5fdf55e493 Update go module to github.com/containerd/containerd/v2 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2023-10-29 20:52:21 -07:00
James Jenkins
b1c5c57be0 Fix Memory Limit test 
Modify the memory limit test, allowing the test to pass when swap is not
enabled.

Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
 2023-01-17 13:07:28 -05:00
Akihiro Suda
5a00d28a6f Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts 
Fix issue 7890

Tested on Ubuntu 22.10, with swapon and swapoff:
```
$ GITHUB_WORKSPACE="" ENABLE_CRI_SANDBOXES="" CONTAINERD_RUNTIME=io.containerd.runc.v2 FOCUS=TestUpdateContainerResources_Memory make cri-integration
...
=== RUN   TestUpdateContainerResources_MemorySwap
    container_update_resources_test.go:161: Create a sandbox
INFO[0000] Using the following image list: {Alpine:docker.io/library/alpine:latest BusyBox:docker.io/library/busybox:latest Pause:registry.k8s.io/pause:3.8 ResourceConsumer:registry.k8s.io/e2e-test-images/resource-consumer:1.10 VolumeCopyUp:ghcr.io/containerd/volume-copy-up:2.1 VolumeOwnership:ghcr.io/containerd/volume-ownership:2.1}
    main_test.go:663: Image "registry.k8s.io/pause:3.8" already exists, not pulling.
    container_update_resources_test.go:174: Create a container with memory limit but no swap
    container_update_resources_test.go:186: Check memory limit in container OCI spec
    container_update_resources_test.go:194: Check memory limit in container OCI spec
    container_update_resources_test.go:200: Start the container
    container_update_resources_test.go:205: Check memory limit in cgroup
    container_update_resources_test.go:211: Update container memory limit after started
    container_update_resources_test.go:217: Check memory limit in container OCI spec
    container_update_resources_test.go:222: Check memory limit in cgroup
--- PASS: TestUpdateContainerResources_MemorySwap (0.88s)
=== RUN   TestUpdateContainerResources_MemoryLimit
    container_update_resources_test.go:228: Create a sandbox
    main_test.go:663: Image "registry.k8s.io/pause:3.8" already exists, not pulling.
    container_update_resources_test.go:238: Create a container with memory limit
    container_update_resources_test.go:249: Check memory limit in container OCI spec
    container_update_resources_test.go:257: Update container memory limit after created
    container_update_resources_test.go:263: Check memory limit in container OCI spec
    container_update_resources_test.go:269: Start the container
    container_update_resources_test.go:274: Check memory limit in cgroup
    container_update_resources_test.go:280: Update container memory limit after started
    container_update_resources_test.go:286: Check memory limit in container OCI spec
    container_update_resources_test.go:292: Check memory limit in cgroup
--- PASS: TestUpdateContainerResources_MemoryLimit (0.91s)
PASS
```

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2023-01-02 13:15:38 +09:00
Phil Estes
ecf00ffe84 Merge pull request #7783 from inspektor-gadget/qasim/cri-disable-swap 
cri: make swapping disabled with memory limit
 2022-12-13 15:21:51 -05:00
Maksym Pavlenko
3bc8fc4d30 Cleanup build constraints 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-12-08 09:36:20 -08:00
Qasim Sarfraz
69975b92bb cri: make swapping disabled with memory limit 
OCI runtime spec defines memory.swap as 'limit of memory+Swap usage'
so setting them to equal should disable the swap. Also, this change
should make containerd behaviour same as other runtimes e.g
'cri-dockerd/dockershim' and won't be impacted when user turn on
'NodeSwap' (https://github.com/kubernetes/enhancements/issues/2400) feature.

Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
 2022-12-08 13:54:55 +01:00
Kazuyoshi Kato
6596a70861 Use github.com/containerd/cgroups/v3 to remove gogo 
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2022-11-14 21:07:48 +00:00
Sebastiaan van Stijn
e041d1a2c1 integration: TestUpdateContainerResources_MemoryLimit: remove TODO comment 
This comment was added in 09a0c9471b when the
Windows integration tests were enabled. The PR (microsoft/hcsshim#931) was
merged, and part of hcsshim v0.9.0, and support for resource limits on Windows
was added in 2bc77b8a28, so it looks like this
comment is no longer current.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-09-05 09:52:29 +02:00
ruiwen-zhao
b7b1200dd3 ContainerStatus to return container resources 
Signed-off-by: ruiwen-zhao <ruiwen@google.com>
 2022-08-24 19:08:06 +00:00
Maksym Pavlenko
2b92c70fa4 Fix command line parsing for image list 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-25 14:19:40 -07:00
Maksym Pavlenko
552d763447 Use image lists in client tests 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2022-07-25 10:47:00 -07:00
Shengjing Zhu
775facd573 cri: fix integration test on cgroupsv2 system 
TestUpdateContainerResources_MemoryLimit still uses old method to
check memlimit in cgroup.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2022-02-28 21:27:53 +08:00
Shengjing Zhu
f4f41296c2 Replace golang.org/x/net/context with std library 
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
 2022-02-22 02:27:05 +08:00
宁明晓10296073
b35fb7d447 remove io/ioutil 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
 2022-01-11 16:07:23 +08: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
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
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
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
Akihiro Suda
d3aa7ee9f0 Run go fmt with Go 1.17 
The new `go fmt` adds `//go:build` lines (https://golang.org/doc/go1.17#tools).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-08-22 09:31:50 +09:00
Phil Estes
cf600abecc Merge pull request #5619 from mikebrow/cri-add-v1-proxy-alpha 
[CRI] move up to CRI v1 and support v1alpha in parallel
 2021-07-09 14:07:24 -04:00
Mike Brown
a5c417ac06 move up to CRI v1 and support v1alpha in parallel 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2021-06-28 09:34:12 -05:00
Claudiu Belu
a78bdf22df tests: Refactors PodSandbox creation 
Most of the tests creating and using Pod Sandboxes in the same way. We can create
a common function that will do that for us, so we can have less duplicated code,
and make it easier to add new tests in the future.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-06-03 16:02:38 +00:00
Claudiu Belu
09a0c9471b tests: Adds support for Windows cri-integration tests 
Currently, the cri-integration tests do not work on Windows due to various reasons.
One of the reasons is because all the tests are using Linux-specific images.
Previous commits refactored the image pulling / usage in the cri-integration tests,
making it easier to update, and easier to configure a custom registry to pull images
with Windows support.

For Windows runs, custom registries can be created, which will also contain Windows
images, and the cri-integration tests can be configured to use those registries by
specifying the "--repo-list" argument, a YAML file which will contain an alternative
mapping of the default registries. This is similar to how E2E tests are handled for
Windows runs in Kubernetes.

Some of the tests are Skipped, as they do not pass yet on Windows.

Windows does not collect inodes used stats, thus, the tests that were expecting non-zero
inodes stats were failing.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
 2021-05-14 11:27:35 +00:00
Derek McGowan
07c98d0bf1 Fix lint in Unix environments 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-05 17:46:01 -07:00
Derek McGowan
77cf032195 Enable golangci on Windows 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-10-01 09:01:16 -07:00
Mike Brown
1b60224e2e use containerd/project header test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-22 19:35:37 -05:00
Lantao Liu
ba8788c6b9 Update kubernetes dependency to 1.15.0. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-07-31 23:52:03 -07:00
Mike Brown
64b067d93f fix integration test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2018-11-08 17:53:47 -06:00
Lantao Liu
0580ce45fd Update test based on new CRI. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-10-05 11:01:20 -07:00
Lantao Liu
bf551b9c4c Add integration test. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-06-14 14:24:17 -07:00
Lantao Liu
605b4a7b6a Update imports 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2018-02-08 02:45:44 +00:00
Lantao Liu
e78c85f76b Use new container update function 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-06 17:57:26 +00:00
Lantao Liu
ecd1638293 Add integration test 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2017-10-03 06:03:54 +00:00