[release/1.7 backport] pkg/userns: deprecate and migrate to github.com/moby/sys/userns#10564
Merged
mxpv merged 3 commits intocontainerd:release/1.7from Aug 9, 2024
Merged
Conversation
Member
thaJeztah
commented
Aug 8, 2024
thaJeztah
commented
- backport pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns #10473
- backport migrate to github.com/moby/sys/userns #10563
full diff: moby/sys@user/v0.1.0...user/v0.2.0 Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 40a315b) Signed-off-by: Sebastiaan van Stijn <[email protected]>
The userns package in libcontainer was integrated into the moby/sys/user module at commit [3778ae603c706494fd1e2c2faf83b406e38d687d][1]. This patch deprecates the containerd fork of that package, and adds it as an alias for the moby/sys/user/userns package. [1]: opencontainers/runc@3778ae6 Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 8437c56) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Commit 8437c56 migrated the use of the userns package to the github.com/moby/sys/user module. After further discussion with maintainers, it was decided to move the userns package to a separate module, as it has no direct relation with "user" operations (other than having "user" in its name). This patch migrates our code to use the new module. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 9776047) Signed-off-by: Sebastiaan van Stijn <[email protected]>
|
Skipping CI for Draft Pull Request. |
Member
Author
|
Some minor changes in patches due to code diverging in this branch, but all trivial changes. |
dosubot
bot
added
dependencies
Member
Author
|
Moving out of draft because #10563 was merged |
estesp
approved these changes
Aug 9, 2024
mxpv
approved these changes
Aug 9, 2024
Mengkzhaoyun
pushed a commit
to open-beagle/containerd
that referenced
this pull request
Sep 4, 2024
containerd 1.7.21 Welcome to the v1.7.21 release of containerd! The twenty-first patch release for containerd 1.7 contains various fixes and updates. * Regenerate introspection UUID if state is empty ([#10510](containerd/containerd#10510)) * Set stderr to empty string when using terminal on Windows ([#10499](containerd/containerd#10499)) * Move builds to Go 1.22 and add support for testing with 1.23 ([#10596](containerd/containerd#10596)) * Borrow latest wsstream from k8s v1.31.x to 1.7 ([#10575](containerd/containerd#10575)) * Ensure the CRIAPIV1Alpha2 warning's lastOccurrence is accurate ([#10571](containerd/containerd#10571)) * Make `StopContainer` idempotent ([#10528](containerd/containerd#10528)) * Make `StopPodSandbox` idempotent ([#10527](containerd/containerd#10527)) * Fix failed force deletion for tasks with PID 0 ([#10523](containerd/containerd#10523)) * Fix packaged runc reporting incorrect version ([#10559](containerd/containerd#10559)) * Ensure `/run/containerd` gets created with correct perms ([#10534](containerd/containerd#10534)) * Ensure the CRIAPIV1Alpha2 warning's lastOccurrence is accurate ([#10571](containerd/containerd#10571)) * Update warnings for deprecated CRI config fields ([#10512](containerd/containerd#10512)) Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Davanum Srinivas * Samuel Karp * Sebastiaan van Stijn * Phil Estes * Maksym Pavlenko * Akhil Mohan * Chris Henzie * Derek McGowan * Kazuyoshi Kato * Sascha Grunert * Akihiro Suda * Erikson Tung * Iceber Gu * Mauri de Souza Meneguzzo * Mike Brown * Shengjing Zhu * TinaMor * rongfu.leng <details><summary>45 commits</summary> <p> * Prepare release notes for v1.7.21 ([#10632](containerd/containerd#10632)) * [`975f279ee`](containerd/containerd@975f279) Prepare release notes for v1.7.21 * go.mod: keep minimum go version at go1.21 ([#10633](containerd/containerd#10633)) * [`d63bd8464`](containerd/containerd@d63bd84) go.mod: keep minimum go version at go1.21 * Move builds to Go 1.22 and add support for testing with 1.23 ([#10596](containerd/containerd#10596)) * [`c76028088`](containerd/containerd@c760280) update golangci-lint to 1.60.1 * [`3b263d082`](containerd/containerd@3b263d0) add go1.23.0, drop go1.21.x * Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4 ([#10590](containerd/containerd#10590)) * [`09ca004de`](containerd/containerd@09ca004) Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4 * Borrow latest wsstream from k8s v1.31.x to 1.7 ([#10575](containerd/containerd#10575)) * [`9269d97b1`](containerd/containerd@9269d97) hide wsstream under internal/ to prevent external use * [`59815fa44`](containerd/containerd@59815fa) golangci-lint should only look for problems in new code * [`1c431dc6f`](containerd/containerd@1c431dc) Run go mod tidy * [`226f93d92`](containerd/containerd@226f93d) Add copyright headers * [`6f3252733`](containerd/containerd@6f32527) switch over references to the new package * [`0a85d476a`](containerd/containerd@0a85d47) Fix up some constant references * [`82bfa44d0`](containerd/containerd@82bfa44) Copy over wsstream from k8s v1.31.0-rc.1 release * Ensure the CRIAPIV1Alpha2 warning's lastOccurrence is accurate ([#10571](containerd/containerd#10571)) * [`52b79f337`](containerd/containerd@52b79f3) Update CRIAPIV1Alpha2 warning lastOccurrence every call * pkg/userns: deprecate and migrate to github.com/moby/sys/userns ([#10564](containerd/containerd#10564)) * [`dce0b5a6d`](containerd/containerd@dce0b5a) migrate to github.com/moby/sys/userns * [`65f7d0740`](containerd/containerd@65f7d07) pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns * [`f21675c27`](containerd/containerd@f21675c) vendor: github.com/moby/sys/user v0.2.0 * update to go1.21.13 / go1.22.6 ([#10570](containerd/containerd#10570)) * [`228914a5e`](containerd/containerd@228914a) update to go1.21.13 / go1.22.6 * Fix TestNewBinaryIOCleanup failing with gotip ([#10554](containerd/containerd#10554)) * [`3ff82ba0f`](containerd/containerd@3ff82ba) Fix TestNewBinaryIOCleanup failing with gotip * Fix packaged runc reporting incorrect version ([#10559](containerd/containerd#10559)) * [`d51143f6f`](containerd/containerd@d51143f) script/setup/install-runc: fix runc using incorrect version * update auths code comment ([#10536](containerd/containerd#10536)) * [`7bb1455d8`](containerd/containerd@7bb1455) update auths code comment * Ensure `/run/containerd` gets created with correct perms ([#10534](containerd/containerd#10534)) * [`16c5fc768`](containerd/containerd@16c5fc7) Ensure /run/containerd is created with correct perms * Make `StopContainer` idempotent ([#10528](containerd/containerd#10528)) * [`6da4e40b2`](containerd/containerd@6da4e40) Make `StopContainer` RPC idempotent * Make `StopPodSandbox` idempotent ([#10527](containerd/containerd#10527)) * [`b3b6f1507`](containerd/containerd@b3b6f15) Make `StopPodSandbox` RPC idempotent * Fix failed force deletion for tasks with PID 0 ([#10523](containerd/containerd#10523)) * [`0db46f664`](containerd/containerd@0db46f6) client: fix tasks with PID 0 cannot be forced to delete * Update warnings for deprecated CRI config fields ([#10512](containerd/containerd#10512)) * [`9afb8dcdf`](containerd/containerd@9afb8dc) deprecation: update warnings for CRI config fields * Regenerate introspection UUID if state is empty ([#10510](containerd/containerd#10510)) * [`b140792e4`](containerd/containerd@b140792) introspection: regenerate UUID if state is empty * Set stderr to empty string when using terminal on Windows ([#10499](containerd/containerd#10499)) * [`f9beac3db`](containerd/containerd@f9beac3) Set stderr to empty string when using terminal on Windows. </p> </details> * **github.com/moby/sys/userns** v0.1.0 **_new_** Previous release can be found at [v1.7.20](https://github.com/containerd/containerd/releases/tag/v1.7.20)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.