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

Jump to bottom

Automated cherry pick of #107695 upstream release 1.22 #108303

Merged
merged 4 commits into from Feb 24, 2022
Merged

Automated cherry pick of #107695 upstream release 1.22 #108303

merged 4 commits into from Feb 24, 2022

Conversation

rphillips
Copy link
Member

@rphillips rphillips commented Feb 23, 2022 •
edited by liggitt

Cherry pick of #107695 on release-1.22.

#107695: kubelet: fix podstatus not containing pod full name

Cherry pick of #107900 on release-1.22.

#107900: Pods that have terminated before starting should not block startup

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

/kind bug regression
/priority critical-urgent
/triage accepted

Merged #107933 and #107932 into a single PR for backport to 1.22.

#107933 hasn't merged to 1.22 while it has already landed on 1.23: #107761

Both branches need #107900

Fixes a 1.22 regression where a static pod that is rapidly updated was failing to start until the Kubelet was restarted.

rphillips and others added 3 commits February 23, 2022 09:48
@rphillips
kubelet: fix podstatus not containing pod full name
744efc5
@gjkim42 @rphillips
Add an e2e test for updating a static pod while it restarts
5d08139
@gjkim42 @rphillips
kubelet: Clean up a static pod that has been terminated before starting
9eeecbe 
- Allow a podWorker to start if it is blocked by a pod that has been
  terminated before starting
- When a pod can't start AND has already been terminated, exit cleanly
- Add a unit test that exercises race conditions in pod workers
@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Feb 23, 2022
@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. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/bug Categorizes issue or PR as related to a bug. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. kind/regression Categorizes issue or PR as related to a regression from a prior release. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. triage/accepted Indicates an issue or PR is ready to be actively worked on. 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. labels Feb 23, 2022
@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. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 23, 2022
@rphillips rphillips mentioned this pull request Feb 23, 2022
Closed
@rphillips rphillips marked this pull request as ready for review February 23, 2022 15:53
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 23, 2022
@rphillips
Copy link
Member Author

/sig node
/retest

@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 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 Feb 23, 2022
@rphillips
Copy link
Member Author

/retest-required

@SergeyKanzhelev SergeyKanzhelev moved this from Triage to Archive-it in SIG Node CI/Test Board Feb 23, 2022
@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 23, 2022
@harche
Copy link
Contributor

harche commented Feb 24, 2022

/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 24, 2022
@harche
Copy link
Contributor

harche commented Feb 24, 2022

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team February 24, 2022 05:38
SIG Node CI/Test Board automation moved this from Archive-it to PRs - Needs Approver Feb 24, 2022
saschagrunert
saschagrunert approved these changes Feb 24, 2022
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm

@saschagrunert saschagrunert added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Feb 24, 2022
@k8s-ci-robot k8s-ci-robot merged commit 4cd3b8c into kubernetes:release-1.22 Feb 24, 2022
SIG Node CI/Test Board automation moved this from PRs - Needs Approver to Done Feb 24, 2022
SIG Node PR Triage automation moved this from Triage to Done Feb 24, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrunalp, rphillips, saschagrunert

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

@gjkim42 gjkim42 mentioned this pull request Mar 24, 2022
Closed
@liggitt liggitt added kind/regression Categorizes issue or PR as related to a regression from a prior release. and removed kind/regression Categorizes issue or PR as related to a regression from a prior release. labels Sep 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp approved these changes

@saschagrunert saschagrunert saschagrunert approved these changes

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@yifan-gu yifan-gu Awaiting requested review from yifan-gu

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

@vishh vishh Awaiting requested review from vishh

Assignees

@saschagrunert saschagrunert

@harche harche

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/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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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
Done
SIG Node CI/Test Board
Archived in project
SIG Node PR Triage
Done
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@rphillips @k8s-ci-robot @harche @mrunalp @saschagrunert @liggitt @gjkim42