Skip to content

pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns#10473

Merged
AkihiroSuda merged 3 commits intocontainerd:mainfrom
thaJeztah:migrate_userns
Jul 26, 2024
Merged

pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns#10473
AkihiroSuda merged 3 commits intocontainerd:mainfrom
thaJeztah:migrate_userns

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jul 16, 2024

vendor: github.com/moby/sys/user v0.2.0

full diff: moby/sys@user/v0.1.0...user/v0.2.0

pkg/userns: deprecate and migrate to github.com/moby/sys/userns

The userns package in libcontainer was integrated into the moby/sys/user
module at commit 3778ae603c706494fd1e2c2faf83b406e38d687d.

This patch deprecates the containerd fork of that package, and adds it as
an alias for the moby/sys/user/userns package.

@k8s-ci-robot
Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link
Copy Markdown
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread pkg/userns/userns_deprecated.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For v2, this package can be just deleted (in a separate commit, for ease of cherry-picking)

@thaJeztah thaJeztah changed the title pkg/userns: deprecate and migrate to github.com/moby/sys/userns pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns Jul 26, 2024
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]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

Added a commit that removes the package

@AkihiroSuda AkihiroSuda added this pull request to the merge queue Jul 26, 2024
@AkihiroSuda AkihiroSuda added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/1.6.x labels Jul 26, 2024
Merged via the queue into containerd:main with commit 762df8b Jul 26, 2024
@thaJeztah thaJeztah deleted the migrate_userns branch August 6, 2024 10:53
@thaJeztah
Copy link
Copy Markdown
Member Author

⚠️ after further discussion, we decided to move this package to a separate module instead of as part of the moby/sys/user module; we should get that change in before tagging a new v2.0.0-xx release;

cc @dmcgowan @estesp FYI

@thaJeztah
Copy link
Copy Markdown
Member Author

⚠️ after further discussion, we decided to move this package to a separate module instead of as part of the moby/sys/user module; we should get that change in before tagging a new v2.0.0-xx release;

cc @dmcgowan @estesp FYI

@thaJeztah thaJeztah added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch dependencies Pull requests that update a dependency file go Pull requests that update Go code size/L

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants