Skip to content

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

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
Merged
merged 3 commits into from
Jul 26, 2024
Merged

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

merged 3 commits into from
Jul 26, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 16, 2024 •
edited
Loading

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

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

This was referenced Jul 16, 2024
Merged
Merged
@thaJeztah thaJeztah marked this pull request as ready for review July 25, 2024 09:33
@dosubot dosubot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code impact/deprecation labels Jul 25, 2024
@thaJeztah thaJeztah mentioned this pull request Jul 25, 2024
Merged
@thaJeztah thaJeztah requested review from dmcgowan and laurazard July 25, 2024 11:56
@thaJeztah thaJeztah mentioned this pull request Jul 25, 2024
Merged
laurazard
laurazard approved these changes Jul 25, 2024
View reviewed changes
Copy link
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

AkihiroSuda
AkihiroSuda reviewed Jul 25, 2024
View reviewed changes
pkg/userns/userns_deprecated.go Outdated
Copy link
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
thaJeztah added 3 commits July 26, 2024 09:47
@thaJeztah
vendor: github.com/moby/sys/user v0.2.0
40a315b 
full diff: moby/sys@user/v0.1.0...user/v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns
8437c56 
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 <github@gone.nl>
@thaJeztah
remove deprecated pkg/userns
eddd90d 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
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 Change to be cherry picked to release/1.6 branch 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 thaJeztah mentioned this pull request Aug 6, 2024
Merged
@thaJeztah
Copy link
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 mentioned this pull request Aug 8, 2024
Merged
@thaJeztah
Copy link
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 mentioned this pull request Aug 8, 2024
Merged
@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
@thaJeztah thaJeztah mentioned this pull request Aug 9, 2024
Merged
@dmcgowan dmcgowan mentioned this pull request Aug 27, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@laurazard laurazard laurazard approved these changes

@dmcgowan dmcgowan Awaiting requested review from dmcgowan

Assignees
No one assigned
Labels
cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@thaJeztah @k8s-ci-robot @AkihiroSuda @laurazard @dmcgowan