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.

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

Fix cleanup of file subpaths #123052

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

jsafrane
Copy link
Member

@jsafrane jsafrane commented Jan 31, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

Allow kubelet orphan cleanup to delete both files and empty directories used as subpath mount points.

A pod does not need to use a directory as a subpath, it can use a file (unix domain socket, pipe, ...) too. Therefore the cleanup should use os.Remove that deletes both files and empty directories.

This contrasts with whole volumes - a volume is always a directory.

Which issue(s) this PR fixes:

Fixes: #106942

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fixed cleanup of Pod volume mounts when a file was used as a subpath.

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


Allow kubelet orphan cleanup to delete both files and empty directories as
subpath mount points.

A pod does not need to use a directory as a subpath, it can use a file
(unix domain socket, pipe, ...) too. Therefore the cleanup should use
`os.Remove` that deletes both files and empty directories.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. 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. 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 Jan 31, 2024
@k8s-ci-robot k8s-ci-robot added 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 Jan 31, 2024
@jsafrane
Copy link
Member Author

/priority important-soon

cc @gnufied @jingxu97 @msau42

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 31, 2024
@bart0sh
Copy link
Contributor

bart0sh commented Feb 1, 2024

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Feb 1, 2024
@bart0sh bart0sh moved this from Triage to Needs Reviewer in SIG Node PR Triage Feb 1, 2024
@gnufied
Copy link
Member

gnufied commented Feb 2, 2024

cc @dobsonj

@dobsonj
Copy link
Member

dobsonj commented Feb 2, 2024

/lgtm

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

LGTM label has been added.

Git tree hash: 4d8f85c38881cc01b861922362f50c8d9135d2d8

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, mrunalp

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

The pull request process is described here

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 Feb 5, 2024
@k8s-ci-robot k8s-ci-robot merged commit 77775d4 into kubernetes:master Feb 5, 2024
14 checks passed
SIG Node PR Triage automation moved this from Needs Reviewer to Done Feb 5, 2024
@k8s-ci-robot k8s-ci-robot added this to the v1.30 milestone Feb 5, 2024
k8s-ci-robot added a commit that referenced this pull request Mar 1, 2024
…3052-upstream-release-1.29

Automated cherry pick of #123052: Fix cleanup of file subpaths
k8s-ci-robot added a commit that referenced this pull request Mar 1, 2024
…3052-upstream-release-1.27

Automated cherry pick of #123052: Fix cleanup of file subpaths
k8s-ci-robot added a commit that referenced this pull request Mar 1, 2024
…3052-upstream-release-1.28

Automated cherry pick of #123052: Fix cleanup of file subpaths
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/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

kubelet delete orphaned pod volumes failed
6 participants