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 #102882: devicemanager: checkpoint: support pre-1.20 data #106295

Merged
merged 4 commits into from Dec 2, 2021
Merged

Automated cherry pick of #102882: devicemanager: checkpoint: support pre-1.20 data #106295

merged 4 commits into from Dec 2, 2021

Conversation

ffromani
Copy link
Contributor

@ffromani ffromani commented Nov 10, 2021 •
edited by liggitt

Cherry pick of #102882 on release-1.20.

#102882: devicemanager: checkpoint: support pre-1.20 data

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

Fixes a regression in 1.20 where the kubelet cannot read devicemanager checkpoint data persisted by a 1.19 kubelet

@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Nov 10, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. 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. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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 Nov 10, 2021
@k8s-ci-robot k8s-ci-robot added area/kubelet area/test sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/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 Nov 10, 2021
@ffromani
Copy link
Contributor Author

/kind bug
/sig node

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Nov 10, 2021
@ffromani
Copy link
Contributor Author

/hold
I'll most likely need to backport some missing utilities

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 10, 2021
@wgahnagl wgahnagl added this to Triage in SIG Node PR Triage Nov 10, 2021
@wgahnagl
Copy link
Contributor

/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added 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. and removed 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 Nov 10, 2021
@ffromani ffromani force-pushed the automated-cherry-pick-of-#102882-upstream-release-1.20 branch from 0bd427e to 6d02f2d Compare November 18, 2021 10:39
@ffromani
Copy link
Contributor Author

verified the (reduced version of) e2e tests locally on BM - the serial lane doesn't have multi-NUMA, SRIOV-enabled machines.

@ffromani
Copy link
Contributor Author

/pull

@ffromani
Copy link
Contributor Author

/help

@ffromani
Copy link
Contributor Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 18, 2021
@ffromani
Copy link
Contributor Author

ffromani commented Nov 19, 2021 •
edited

FYI @endocrimes @klueska @swatisehgal

Unfortunately this isn't a trivial rebase, some changes had to be done especially to have some e2e test coverage.

@klueska
Copy link
Contributor

klueska commented Nov 19, 2021

So the "core" code changes cherry-picked cleanly, but you needed to patch up the e2e tests with some extra commits? or did you have to also tweak the first commit in this chain to resolve some conflicts?

@ffromani
Copy link
Contributor Author

ffromani commented Nov 19, 2021 •
edited

So the "core" code changes cherry-picked cleanly, but you needed to patch up the e2e tests with some extra commits? or did you have to also tweak the first commit in this chain to resolve some conflicts?

the core code changes got in relatively cleanly. The lion's share of the changes and extra work went into the e2e tests. I'd still be kindly requesting/happy with a deep review, because the 1.20 branch is in deep maintenance mode and I'd love to contribute positively to the stability of the branch.

Note: I'm aware I'm asking quite a lot here, still I believe this backport is worth because it silently breaks the devicemanager flow on upgrades.

endocrimes
endocrimes approved these changes Nov 29, 2021
View reviewed changes
Copy link
Member

@endocrimes endocrimes left a comment

Choose a reason for hiding this comment

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

/lgtm

this is a slightly riskier backport but imo worth it to de-risk upgrades for folks.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2021
@klueska
Copy link
Contributor

klueska commented Nov 30, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: endocrimes, fromanirh, klueska

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 Nov 30, 2021
@endocrimes endocrimes moved this from Waiting on Author to Needs Approver in SIG Node PR Triage Nov 30, 2021
@endocrimes endocrimes mentioned this pull request Nov 30, 2021
Closed
@ehashman ehashman moved this from Needs Approver to Done in SIG Node PR Triage Dec 2, 2021
@puerco
Copy link
Member

puerco commented Dec 2, 2021

Thank you for providing context around the changes and the extra commit @fromanirh
/lgtm

@puerco puerco added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 2, 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 Dec 2, 2021
@puerco
Copy link
Member

puerco commented Dec 2, 2021

/test pull-kubernetes-bazel-test
/test pull-kubernetes-typecheck

@k8s-ci-robot k8s-ci-robot merged commit ec89cd0 into kubernetes:release-1.20 Dec 2, 2021
@liggitt liggitt added the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Apr 27, 2022
@ffromani ffromani deleted the automated-cherry-pick-of-#102882-upstream-release-1.20 branch July 17, 2023 08:40
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Sep 9, 2023
@liggitt liggitt added the kind/feature Categorizes issue or PR as related to a new feature. label Sep 27, 2023
chenchun pushed a commit to chenchun/kubernetes that referenced this pull request Mar 20, 2024
@borgerli
Merge branch 'tke/v1.20.6-device-manager-support-statefile-v1' into '…
2d5cebc 
…tke/v1.20.6' (merge request !909)

tke/v1.20.6-device-manager-support-statefile-v1
Issue：kubernetes#102880
Cherry Pick：kubernetes#106295
device manager 读取state file时同时适配v1和v2两种格式
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@endocrimes endocrimes endocrimes approved these changes

@MHBauer MHBauer Awaiting requested review from MHBauer

@vikaschoudhary16 vikaschoudhary16 Awaiting requested review from vikaschoudhary16

Assignees

@endocrimes endocrimes

@puerco puerco

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test 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. kind/feature Categorizes issue or PR as related to a new feature. kind/regression Categorizes issue or PR as related to a regression from a prior release. 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. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node CI/Test Board
Archive-it
SIG Node CI/Test Board
Archived in project
SIG Node PR Triage
Done
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@ffromani @wgahnagl @klueska @k8s-ci-robot @puerco @endocrimes @liggitt