Skip to content

pkg/kubelet/userns/inuserns: use moby/sys/userns#128237

Merged
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
kolyshkin:userns
Oct 23, 2024
Merged

pkg/kubelet/userns/inuserns: use moby/sys/userns#128237
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
kolyshkin:userns

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

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).

Let's switch to moby/sys/userns.

What type of PR is this?

/kind deprecation

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. labels Oct 21, 2024
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Adding the "do-not-merge/release-note-label-needed" label and removing any existing "release-note-none" label because there is a "kind/deprecation" label on the PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 21, 2024
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Oct 21, 2024
@k8s-ci-robot k8s-ci-robot requested review from a team, bobbypage and derekwaynecarr October 21, 2024 16:58
@k8s-ci-robot k8s-ci-robot added area/dependency Issues or PRs related to dependency changes area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 21, 2024
Comment thread pkg/kubelet/userns/inuserns/inuserns_linux.go Outdated
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 21, 2024
@dims
Copy link
Copy Markdown
Member

dims commented Oct 21, 2024

/release-note-none

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@dims: you can not set the release note label to "release-note-none" because the PR has the label "kind/deprecation".

Details

In response to this:

/release-note-none

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dims
Copy link
Copy Markdown
Member

dims commented Oct 21, 2024

@kolyshkin looks like one folder wasn't added to the PR

Generated files need to be updated
Not currently on any branch.
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	LICENSES/vendor/github.com/moby/sys/userns/

nothing added to commit but untracked files present (use "git add" to track)

Please run 'hack/update-vendor-licenses.sh'

@dims dims added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. labels Oct 21, 2024
@dims
Copy link
Copy Markdown
Member

dims commented Oct 21, 2024

/release-note-none

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Oct 21, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Oct 21, 2024
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 <[email protected]>
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 22, 2024
@dims
Copy link
Copy Markdown
Member

dims commented Oct 22, 2024

As expected adding one dependency

-Direct Dependencies: 188 
+Direct Dependencies: 189 
 Transitive Dependencies: 333 
-Total Dependencies: 371 
+Total Dependencies: 372 
 Max Depth Of Dependencies: 25 
 All dependencies:
 
@@ -256,6 +256,7 @@
 github.com/moby/ipvs
 github.com/moby/spdystream
 github.com/moby/sys/mountinfo
+github.com/moby/sys/userns
 github.com/moby/term
 github.com/modern-go/concurrent
 github.com/modern-go/reflect2

@dims
Copy link
Copy Markdown
Member

dims commented Oct 22, 2024

This package was moved out from runc/libcontainer and it will be made
deprecated.

Signed-off-by: Kir Kolyshkin <[email protected]>
@k8s-ci-robot k8s-ci-robot added the sig/storage Categorizes an issue or PR as relevant to SIG Storage. label Oct 23, 2024
@dims
Copy link
Copy Markdown
Member

dims commented Oct 23, 2024

/approve
/lgtm

straight forward replace

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 23, 2024
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 7c2dd8a666cd3c91c39b9e0b51e33a22e98e4bfb

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AkihiroSuda, dims, kolyshkin, mrunalp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2024
@k8s-ci-robot k8s-ci-robot merged commit cdc0cf5 into kubernetes:master Oct 23, 2024
@k8s-ci-robot k8s-ci-robot added this to the v1.32 milestone Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Development

Successfully merging this pull request may close these issues.

5 participants