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 #112624: fsquota: only generate pod uuid is nil #115314: kubelet: Fix fs quota monitoring on volumes #116794

Merged
merged 2 commits into from Apr 4, 2023
Merged

Automated cherry pick of #112624: fsquota: only generate pod uuid is nil #115314: kubelet: Fix fs quota monitoring on volumes #116794

merged 2 commits into from Apr 4, 2023

Conversation

pacoxu
Copy link
Member

@pacoxu pacoxu commented Mar 21, 2023 •
edited by liggitt

Cherry pick of #112624 #115314 on release-1.25.

#112624: fsquota: only generate pod uuid is nil
#115314: kubelet: Fix fs quota monitoring on volumes

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

fix a 1.24 regression in kubelet: Fix fs quota monitoring on volumes

pacoxu and others added 2 commits March 21, 2023 15:02
@pacoxu
fsquota: only generate pod uuid is nil
32d3b4e
@alex-matei @pacoxu
kubelet: Fix fs quota monitoring on volumes
9cb693e 
File system quota monitoring setup fails on subsequent invocations,
each time quota setup is invoked a new random UID is generated for
each pod and compared with the previously stored UID for the folder.
Fix it by keeping track of mapping between internal uid generated
for a pod and actual external pod uid.

Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com>
@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Mar 21, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Mar 21, 2023
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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-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. labels Mar 21, 2023
@k8s-ci-robot
Copy link
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.

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 the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Mar 21, 2023
@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 21, 2023
@pacoxu
Copy link
Member Author

pacoxu commented Mar 21, 2023

@alex-matei
/cc @jsafrane
/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 21, 2023
@rata
Copy link
Member

rata commented Mar 21, 2023

/lgtm

It seems both patches apply without conflicts

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

LGTM label has been added.

Git tree hash: cd90439e91f4f2edf371ebf7a5b6004ed0f87002

@jsafrane
Copy link
Member

/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 Mar 22, 2023
@pacoxu
Copy link
Member Author

pacoxu commented Mar 23, 2023

/cc @kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team March 23, 2023 02:06
@xmudrii
Copy link
Member

xmudrii commented Apr 4, 2023

/retest

xmudrii
xmudrii approved these changes Apr 4, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

For RelEng:
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, pacoxu, xmudrii

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

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 4, 2023
@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 Apr 4, 2023
@pacoxu
Copy link
Member Author

pacoxu commented Apr 4, 2023

/retest

@pacoxu
Copy link
Member Author

pacoxu commented Apr 4, 2023

/test pull-kubernetes-e2e-kind-ipv6

@k8s-ci-robot k8s-ci-robot merged commit c961e13 into kubernetes:release-1.25 Apr 4, 2023
12 checks passed
@pacoxu pacoxu deleted the automated-cherry-pick-of-#112624-#115314-upstream-release-1.25 branch July 14, 2023 08:15
@liggitt liggitt added the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Aug 3, 2023
@liggitt liggitt removed the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Sep 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xmudrii xmudrii xmudrii approved these changes

@Jiawei0227 Jiawei0227 Awaiting requested review from Jiawei0227

@rata rata Awaiting requested review from rata

@jsafrane jsafrane Awaiting requested review from jsafrane

Assignees

@rata rata

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. 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 Denotes a PR that will be considered when it comes time to generate release notes. 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
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@pacoxu @k8s-ci-robot @rata @jsafrane @xmudrii @liggitt @alex-matei