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

Automated cherry pick of #102576: kubelet: do not call RemoveAll on volumes directory for #103859

Merged
merged 2 commits into from Aug 6, 2021
Merged

Automated cherry pick of #102576: kubelet: do not call RemoveAll on volumes directory for #103859

merged 2 commits into from Aug 6, 2021

Conversation

dobsonj
Copy link
Member

@dobsonj dobsonj commented Jul 22, 2021

Cherry pick of #102576 on release-1.19.

#102576: kubelet: do not call RemoveAll on volumes directory for

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jul 22, 2021
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 22, 2021
@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 Jul 22, 2021
@dobsonj
Copy link
Member Author

dobsonj commented Jul 22, 2021

/kind bug
/triage accepted
/priority important-soon
/release-note-none
/sig storage
/joke

@k8s-ci-robot
Copy link
Contributor

@dobsonj: There’s a new type of broom out, it’s sweeping the nation.

In response to this:

/kind bug
/triage accepted
/priority important-soon
/release-note-none
/sig storage
/joke

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/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 Jul 22, 2021
@dobsonj
Copy link
Member Author

dobsonj commented Jul 22, 2021

This PR backports the fix for issue #101911, which prevents data loss under the pod volumes directory if/when we hit certain race conditions during orphaned pod cleanup.

The changes in test/e2e/storage/drivers/csi.go from the original PR are not included because the --check-volume-lifecycle argument was introduced in hostpath 1.7.0, and k8s 1.19 is using hostpath 1.4.0 where that argument is not supported.

pkg/kubelet/kubelet_volumes.go required manual merging to account for logging differences. k8s 1.21+ uses structured logging (i.e. klog.ErrorS) while older releases use unstructured logging (i.e. klog.Errorf).

/cc @gnufied @msau42

@msau42
Copy link
Member

msau42 commented Jul 23, 2021

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2021
@dobsonj
Copy link
Member Author

dobsonj commented Jul 23, 2021

/assign @thockin

@thockin
Copy link
Member

thockin commented Jul 26, 2021

Thanks!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 26, 2021
@ehashman ehashman added this to Triage in SIG Node PR Triage Aug 2, 2021
@ehashman ehashman moved this from Triage to Done in SIG Node PR Triage Aug 2, 2021
@ehashman ehashman moved this from Done to Needs Approver in SIG Node PR Triage Aug 4, 2021
@ehashman ehashman moved this from Needs Approver to Done in SIG Node PR Triage Aug 5, 2021
cpanato
cpanato approved these changes Aug 6, 2021
View reviewed changes
Copy link
Member

@cpanato cpanato left a comment

Choose a reason for hiding this comment

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

from RelEng:
/lgtm

@cpanato cpanato added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 6, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Aug 6, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, dobsonj, msau42, thockin

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

@cpanato
Copy link
Member

cpanato commented Aug 6, 2021

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@cpanato
Copy link
Member

cpanato commented Aug 6, 2021

/test pull-kubernetes-integration

@k8s-ci-robot k8s-ci-robot merged commit f889896 into kubernetes:release-1.19 Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpanato cpanato cpanato approved these changes

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

@thockin thockin Awaiting requested review from thockin

@gnufied gnufied Awaiting requested review from gnufied

@msau42 msau42 Awaiting requested review from msau42

Assignees

@cpanato cpanato

@thockin thockin

@msau42 msau42

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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-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. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dobsonj @k8s-ci-robot @msau42 @thockin @cpanato