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

libcontainer/userns: migrate to github.com/moby/sys/userns #4350

Merged
merged 1 commit into from
Oct 9, 2024
Merged

libcontainer/userns: migrate to github.com/moby/sys/userns #4350

merged 1 commit into from
Oct 9, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 16, 2024 •
edited
Loading

The userns package was moved to moby/sys/userns module at commit 3778ae6.

This patch deprecates the old location, and adds it as an alias for the moby/sys/userns package.

This was referenced Jul 16, 2024
Merged
Merged
@thaJeztah thaJeztah mentioned this pull request Aug 6, 2024
Merged
@thaJeztah thaJeztah changed the title libcontainer/userns: migrate to github.com/moby/sys/user/userns libcontainer/userns: migrate to github.com/moby/sys/userns Aug 8, 2024
@thaJeztah thaJeztah marked this pull request as ready for review August 23, 2024 17:46
AkihiroSuda
AkihiroSuda reviewed Aug 31, 2024
View reviewed changes
libcontainer/userns/userns_deprecated.go
@@ -1,8 +1,13 @@
// Deprecated: use github.com/moby/sys/userns
Copy link
Member

Choose a reason for hiding this comment

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

Can we just remove libct/userns ?

Copy link
Member

@cyphar cyphar Aug 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think the concern is downstream users that import github.com/opencontainers/runc/libcontainer/userns. It seems there are a fair number of places that import this package unfortunately (though it seems they're mostly kubelet and kubelet forks and buildah?).

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, correct; mostly to give potential users of this a warning that they should use the separate module instead. We can decide how long to keep the alias in place (although it doesn't give a significant amount of maintenance)

@thaJeztah thaJeztah requested a review from cyphar September 4, 2024 08:50
@thaJeztah thaJeztah mentioned this pull request Sep 4, 2024
Open
19 tasks
@thaJeztah @lifubang
libcontainer/userns: migrate to github.com/moby/sys/userns
9b60a93 
The userns package was moved to the moby/sys/userns module
at commit 3778ae6.

This patch deprecates the old location, and adds it as an alias
for the moby/sys/userns package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

@kolyshkin @cyphar this one good to go?

cyphar
cyphar approved these changes Oct 9, 2024
View reviewed changes
Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

LGTM

@cyphar cyphar merged commit 9112335 into opencontainers:main Oct 9, 2024
42 checks passed
@thaJeztah thaJeztah deleted the migrate_userns branch October 9, 2024 19:03
@kolyshkin kolyshkin mentioned this pull request Oct 21, 2024
Merged
kolyshkin added a commit to kolyshkin/kubernetes that referenced this pull request Oct 21, 2024
@kolyshkin
pkg/kubelet/user/userns: remove, use moby/sys/userns
e5cecea 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/kubernetes that referenced this pull request Oct 22, 2024
@kolyshkin
pkg/kubelet/user/userns: remove, use moby/sys/userns
54d43ec 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/kubernetes that referenced this pull request Oct 22, 2024
@kolyshkin
pkg/kubelet/user/userns: remove, use moby/sys/userns
a635fce 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/kubernetes that referenced this pull request Oct 23, 2024
@kolyshkin
pkg/kubelet/user/userns: remove, use moby/sys/userns
eabc3f4 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
scott-grimes pushed a commit to scott-grimes/kubernetes that referenced this pull request Oct 23, 2024
@kolyshkin @scott-grimes
pkg/kubelet/user/userns: remove, use moby/sys/userns
74ad354 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
richabanker pushed a commit to richabanker/kubernetes that referenced this pull request Oct 29, 2024
@kolyshkin @richabanker
pkg/kubelet/user/userns: remove, use moby/sys/userns
fa17fa1 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
felipeagger pushed a commit to felipeagger/kubernetes that referenced this pull request Nov 6, 2024
@kolyshkin @felipeagger
pkg/kubelet/user/userns: remove, use moby/sys/userns
376a2a3 
The code from github.com/opencontainers/runc/libcontainer/userns package
was moved into github.com/moby/sys/user and github.com/moby/sys/userns
(see [1]), and the runc package is now deprecated in favor of moby/sys
(see [2]).

In addition, moby/sys/userns now has a non-Linux implementation, so
pkg/kubelet/user/userns package (introduced in commit 2e999ff to make a
non-Linux implementation) is not really needed anymore.

Let's switch to moby/sys/userns, and remove the package.

[1]: https://github.com/moby/sys/releases/tag/userns%2Fv0.1.0
[2]: opencontainers/runc#4350

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kolyshkin kolyshkin kolyshkin left review comments

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@cyphar cyphar cyphar approved these changes

@lifubang lifubang lifubang 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.
5 participants
@thaJeztah @lifubang @cyphar @kolyshkin @AkihiroSuda