Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/1.6 backport] assorted test-fixes #8000

Merged
merged 2 commits into from
Jan 25, 2023
Merged

[release/1.6 backport] assorted test-fixes #8000

merged 2 commits into from
Jan 25, 2023

Conversation

thaJeztah
Copy link
Member

AkihiroSuda and others added 2 commits January 24, 2023 22:02
@AkihiroSuda @thaJeztah
Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts
5594f70 
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>
(cherry picked from commit 5a00d28)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@mqasimsarfraz @thaJeztah
cri: Fix TestUpdateOCILinuxResource for host w/o swap controller
91a68ed 
Tested on Ubuntu 20.04 w/o swap controller:
```
$ stat -fc %T /sys/fs/cgroup/
tmpfs
$ la -la /sys/fs/cgroup/memory/memory.memsw.limit_in_bytes
ls: cannot access '/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes': No such file or directory
$  go test -v ./pkg/cri/sbserver/ -run TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_update_each_resource
=== RUN   TestUpdateOCILinuxResource/should_skip_empty_fields
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields
--- PASS: TestUpdateOCILinuxResource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_update_each_resource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_skip_empty_fields (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields (0.00s)
PASS
ok      github.com/containerd/containerd/pkg/cri/sbserver       (cached)
$ go test -v ./pkg/cri/server/ -run TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_update_each_resource
=== RUN   TestUpdateOCILinuxResource/should_skip_empty_fields
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields
=== RUN   TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map
--- PASS: TestUpdateOCILinuxResource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_update_each_resource (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_skip_empty_fields (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_fill_empty_fields (0.00s)
    --- PASS: TestUpdateOCILinuxResource/should_be_able_to_patch_the_unified_map (0.00s)
PASS
ok      github.com/containerd/containerd/pkg/cri/server (cached)
```

Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
(cherry picked from commit 9c8c450)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@samuelkarp samuelkarp merged commit 8511d43 into containerd:release/1.6 Jan 25, 2023
@thaJeztah thaJeztah deleted the 1.6_backport_test_fixes branch January 25, 2023 08:55
@dmcgowan dmcgowan mentioned this pull request Jan 28, 2023
Merged
aravindhp added a commit to openshift/containerd that referenced this pull request Feb 9, 2023
@aravindhp
Merge tag 'v1.6.16' into release-4.13
2d3127c 
containerd 1.6.16

Welcome to the v1.6.16 release of containerd!

The sixteenth patch release for containerd 1.6 includes various bug fixes and updates.

* **Fix push error propagation** ([containerd#7990](containerd#7990))
* **Fix slice append error with HugepageLimits for Linux** ([containerd#7995](containerd#7995))
* **Update default seccomp profile for PKU and CAP_SYS_NICE** ([containerd#8001](containerd#8001))
* **Fix overlayfs error when upperdirlabel option is set** ([containerd#8002](containerd#8002))

See the changelog for complete list of changes

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Akihiro Suda
* Derek McGowan
* Samuel Karp
* Sebastiaan van Stijn
* Phil Estes
* Craig Ingram
* Justin Chadwell
* Qasim Sarfraz
* Wei Fu
* bin liu
* cardy.tang
* rongfu.leng

<details><summary>30 commits</summary>
<p>

* [release/1.6] Prepare v1.6.16 ([containerd#8016](containerd#8016))
  * [`d3c595aa3`](containerd@d3c595a) Prepare release notes for v1.6.16
* [release/1.6 backport] Fix tx closed error when upperdirlabel specified ([containerd#8002](containerd#8002))
  * [`8c704036a`](containerd@8c70403) Fix tx closed error when upperdirlabel specified
* [release/1.6 backport] assorted test-fixes ([containerd#8000](containerd#8000))
  * [`91a68edd7`](containerd@91a68ed) cri: Fix TestUpdateOCILinuxResource for host w/o swap controller
  * [`5594f706e`](containerd@5594f70) Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts
* [release/1.6 backport] seccomp updates ([containerd#8001](containerd#8001))
  * [`7037f5313`](containerd@7037f53) seccomp: add get_mempolicy, mbind, set_mempolicy, with CAP_SYS_NICE
  * [`d22919a1c`](containerd@d22919a) seccomp: seccomp: add syscalls related to PKU in default policy
* [release/1.6 backport] Harden GITHUB_TOKEN permissions ([containerd#7999](containerd#7999))
  * [`8b8a21fe4`](containerd@8b8a21f) Harden GITHUB_TOKEN permissions
* [release/1.6 backport] assorted updates to Vagrantfile ([containerd#7996](containerd#7996))
  * [`8009948bb`](containerd@8009948) Vagrantfile: fix comments about SELinux
  * [`550424f92`](containerd@550424f) Vagrantfile: install-rootless-podman: remove `setenforce 0`
  * [`2c32f8559`](containerd@2c32f85) CI: update Fedora to 37
  * [`556bb0cc8`](containerd@556bb0c) Vagrantfile: explicitly specify rsync as the shared folder driver
  * [`edfac1834`](containerd@edfac18) fix install cni script
  * [`91d5e53fb`](containerd@91d5e53) Vagrantfile: dump containerd log after critest
* [release/1.6 backport] Fix slice append error ([containerd#7995](containerd#7995))
  * [`ab193eb20`](containerd@ab193eb) pkg/cri: optimize slice initialization
  * [`e6cf5ec58`](containerd@e6cf5ec) Fix slice append error
* [release/1.6] update to go1.18.10 ([containerd#7992](containerd#7992))
  * [`6a8a6531f`](containerd@6a8a653) [release/1.6] update to go1.18.10
* [release/1.6 backport] release/Dockerfile: set DEBIAN_FRONTEND=noninteractive ([containerd#7991](containerd#7991))
  * [`d0dc7988a`](containerd@d0dc798) release/Dockerfile: set DEBIAN_FRONTEND=noninteractive
* [release/1.6 backport] pushWriter: correctly propagate errors ([containerd#7990](containerd#7990))
  * [`1584c2581`](containerd@1584c25) pushWriter: correctly propagate errors
* [release/1.6] mod: update github.com/pelletier/go-toml@v1.9.5 ([containerd#7942](containerd#7942))
  * [`545f22091`](containerd@545f220) mod: update github.com/pelletier/go-toml@v1.9.5
</p>
</details>

* **github.com/pelletier/go-toml**  v1.9.3 -> v1.9.5

Previous release can be found at [v1.6.15](https://github.com/containerd/containerd/releases/tag/v1.6.15)
aravindhp added a commit to openshift/containerd that referenced this pull request Feb 9, 2023
@aravindhp
Merge tag 'v1.6.16' into release-4.12
8d1b8df 
containerd 1.6.16

Welcome to the v1.6.16 release of containerd!

The sixteenth patch release for containerd 1.6 includes various bug fixes and updates.

* **Fix push error propagation** ([containerd#7990](containerd#7990))
* **Fix slice append error with HugepageLimits for Linux** ([containerd#7995](containerd#7995))
* **Update default seccomp profile for PKU and CAP_SYS_NICE** ([containerd#8001](containerd#8001))
* **Fix overlayfs error when upperdirlabel option is set** ([containerd#8002](containerd#8002))

See the changelog for complete list of changes

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Akihiro Suda
* Derek McGowan
* Samuel Karp
* Sebastiaan van Stijn
* Phil Estes
* Craig Ingram
* Justin Chadwell
* Qasim Sarfraz
* Wei Fu
* bin liu
* cardy.tang
* rongfu.leng

<details><summary>30 commits</summary>
<p>

* [release/1.6] Prepare v1.6.16 ([containerd#8016](containerd#8016))
  * [`d3c595aa3`](containerd@d3c595a) Prepare release notes for v1.6.16
* [release/1.6 backport] Fix tx closed error when upperdirlabel specified ([containerd#8002](containerd#8002))
  * [`8c704036a`](containerd@8c70403) Fix tx closed error when upperdirlabel specified
* [release/1.6 backport] assorted test-fixes ([containerd#8000](containerd#8000))
  * [`91a68edd7`](containerd@91a68ed) cri: Fix TestUpdateOCILinuxResource for host w/o swap controller
  * [`5594f706e`](containerd@5594f70) Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts
* [release/1.6 backport] seccomp updates ([containerd#8001](containerd#8001))
  * [`7037f5313`](containerd@7037f53) seccomp: add get_mempolicy, mbind, set_mempolicy, with CAP_SYS_NICE
  * [`d22919a1c`](containerd@d22919a) seccomp: seccomp: add syscalls related to PKU in default policy
* [release/1.6 backport] Harden GITHUB_TOKEN permissions ([containerd#7999](containerd#7999))
  * [`8b8a21fe4`](containerd@8b8a21f) Harden GITHUB_TOKEN permissions
* [release/1.6 backport] assorted updates to Vagrantfile ([containerd#7996](containerd#7996))
  * [`8009948bb`](containerd@8009948) Vagrantfile: fix comments about SELinux
  * [`550424f92`](containerd@550424f) Vagrantfile: install-rootless-podman: remove `setenforce 0`
  * [`2c32f8559`](containerd@2c32f85) CI: update Fedora to 37
  * [`556bb0cc8`](containerd@556bb0c) Vagrantfile: explicitly specify rsync as the shared folder driver
  * [`edfac1834`](containerd@edfac18) fix install cni script
  * [`91d5e53fb`](containerd@91d5e53) Vagrantfile: dump containerd log after critest
* [release/1.6 backport] Fix slice append error ([containerd#7995](containerd#7995))
  * [`ab193eb20`](containerd@ab193eb) pkg/cri: optimize slice initialization
  * [`e6cf5ec58`](containerd@e6cf5ec) Fix slice append error
* [release/1.6] update to go1.18.10 ([containerd#7992](containerd#7992))
  * [`6a8a6531f`](containerd@6a8a653) [release/1.6] update to go1.18.10
* [release/1.6 backport] release/Dockerfile: set DEBIAN_FRONTEND=noninteractive ([containerd#7991](containerd#7991))
  * [`d0dc7988a`](containerd@d0dc798) release/Dockerfile: set DEBIAN_FRONTEND=noninteractive
* [release/1.6 backport] pushWriter: correctly propagate errors ([containerd#7990](containerd#7990))
  * [`1584c2581`](containerd@1584c25) pushWriter: correctly propagate errors
* [release/1.6] mod: update github.com/pelletier/go-toml@v1.9.5 ([containerd#7942](containerd#7942))
  * [`545f22091`](containerd@545f220) mod: update github.com/pelletier/go-toml@v1.9.5
</p>
</details>

* **github.com/pelletier/go-toml**  v1.9.3 -> v1.9.5

Previous release can be found at [v1.6.15](https://github.com/containerd/containerd/releases/tag/v1.6.15)
aravindhp added a commit to openshift/containerd that referenced this pull request Feb 9, 2023
@aravindhp
Merge tag 'v1.6.16' into release-4.11
29c669d 
containerd 1.6.16

Welcome to the v1.6.16 release of containerd!

The sixteenth patch release for containerd 1.6 includes various bug fixes and updates.

* **Fix push error propagation** ([containerd#7990](containerd#7990))
* **Fix slice append error with HugepageLimits for Linux** ([containerd#7995](containerd#7995))
* **Update default seccomp profile for PKU and CAP_SYS_NICE** ([containerd#8001](containerd#8001))
* **Fix overlayfs error when upperdirlabel option is set** ([containerd#8002](containerd#8002))

See the changelog for complete list of changes

Please try out the release binaries and report any issues at
https://github.com/containerd/containerd/issues.

* Akihiro Suda
* Derek McGowan
* Samuel Karp
* Sebastiaan van Stijn
* Phil Estes
* Craig Ingram
* Justin Chadwell
* Qasim Sarfraz
* Wei Fu
* bin liu
* cardy.tang
* rongfu.leng

<details><summary>30 commits</summary>
<p>

* [release/1.6] Prepare v1.6.16 ([containerd#8016](containerd#8016))
  * [`d3c595aa3`](containerd@d3c595a) Prepare release notes for v1.6.16
* [release/1.6 backport] Fix tx closed error when upperdirlabel specified ([containerd#8002](containerd#8002))
  * [`8c704036a`](containerd@8c70403) Fix tx closed error when upperdirlabel specified
* [release/1.6 backport] assorted test-fixes ([containerd#8000](containerd#8000))
  * [`91a68edd7`](containerd@91a68ed) cri: Fix TestUpdateOCILinuxResource for host w/o swap controller
  * [`5594f706e`](containerd@5594f70) Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts
* [release/1.6 backport] seccomp updates ([containerd#8001](containerd#8001))
  * [`7037f5313`](containerd@7037f53) seccomp: add get_mempolicy, mbind, set_mempolicy, with CAP_SYS_NICE
  * [`d22919a1c`](containerd@d22919a) seccomp: seccomp: add syscalls related to PKU in default policy
* [release/1.6 backport] Harden GITHUB_TOKEN permissions ([containerd#7999](containerd#7999))
  * [`8b8a21fe4`](containerd@8b8a21f) Harden GITHUB_TOKEN permissions
* [release/1.6 backport] assorted updates to Vagrantfile ([containerd#7996](containerd#7996))
  * [`8009948bb`](containerd@8009948) Vagrantfile: fix comments about SELinux
  * [`550424f92`](containerd@550424f) Vagrantfile: install-rootless-podman: remove `setenforce 0`
  * [`2c32f8559`](containerd@2c32f85) CI: update Fedora to 37
  * [`556bb0cc8`](containerd@556bb0c) Vagrantfile: explicitly specify rsync as the shared folder driver
  * [`edfac1834`](containerd@edfac18) fix install cni script
  * [`91d5e53fb`](containerd@91d5e53) Vagrantfile: dump containerd log after critest
* [release/1.6 backport] Fix slice append error ([containerd#7995](containerd#7995))
  * [`ab193eb20`](containerd@ab193eb) pkg/cri: optimize slice initialization
  * [`e6cf5ec58`](containerd@e6cf5ec) Fix slice append error
* [release/1.6] update to go1.18.10 ([containerd#7992](containerd#7992))
  * [`6a8a6531f`](containerd@6a8a653) [release/1.6] update to go1.18.10
* [release/1.6 backport] release/Dockerfile: set DEBIAN_FRONTEND=noninteractive ([containerd#7991](containerd#7991))
  * [`d0dc7988a`](containerd@d0dc798) release/Dockerfile: set DEBIAN_FRONTEND=noninteractive
* [release/1.6 backport] pushWriter: correctly propagate errors ([containerd#7990](containerd#7990))
  * [`1584c2581`](containerd@1584c25) pushWriter: correctly propagate errors
* [release/1.6] mod: update github.com/pelletier/go-toml@v1.9.5 ([containerd#7942](containerd#7942))
  * [`545f22091`](containerd@545f220) mod: update github.com/pelletier/go-toml@v1.9.5
</p>
</details>

* **github.com/pelletier/go-toml**  v1.9.3 -> v1.9.5

Previous release can be found at [v1.6.15](https://github.com/containerd/containerd/releases/tag/v1.6.15)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samuelkarp samuelkarp samuelkarp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thaJeztah @samuelkarp @AkihiroSuda @mqasimsarfraz