Skip to content

Automated cherry pick of #114351: Ignore container events with nil PodSandboxStatus#115552

Merged
k8s-ci-robot merged 1 commit intokubernetes:release-1.26from
ruiwen-zhao:automated-cherry-pick-of-#114351-upstream-release-1.26
Feb 10, 2023
Merged

Automated cherry pick of #114351: Ignore container events with nil PodSandboxStatus#115552
k8s-ci-robot merged 1 commit intokubernetes:release-1.26from
ruiwen-zhao:automated-cherry-pick-of-#114351-upstream-release-1.26

Conversation

@ruiwen-zhao
Copy link
Copy Markdown
Contributor

@ruiwen-zhao ruiwen-zhao commented Feb 6, 2023

Cherry pick of #114351 on release-1.26.

#114351: Ignore container events with nil PodSandboxStatus

This is a bug fix. Without this fix, when Evented PLEG is enabled, kubelet will panic if container runtime sends container events with nil PodSandboxStatus.

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


Signed-off-by: ruiwen-zhao <ruiwen@google.com>
@k8s-ci-robot k8s-ci-robot added this to the v1.26 milestone Feb 6, 2023
@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/S Denotes a PR that changes 10-29 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 6, 2023
@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 Feb 6, 2023
@ruiwen-zhao
Copy link
Copy Markdown
Contributor Author

/assign @mrunalp

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@ruiwen-zhao
Copy link
Copy Markdown
Contributor Author

/retest

Copy link
Copy Markdown
Contributor

@mrunalp mrunalp left a comment

Choose a reason for hiding this comment

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

/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 6, 2023
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 963133519e9ce8de8a4a8ea03e6860aa817ffa61

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikebrow, mrunalp, ruiwen-zhao

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

The pull request process is described here

Details 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 6, 2023
@bart0sh
Copy link
Copy Markdown
Contributor

bart0sh commented Feb 7, 2023

/kind bug
/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added 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. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Feb 7, 2023
@k8s-ci-robot k8s-ci-robot 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 Feb 7, 2023
@bart0sh
Copy link
Copy Markdown
Contributor

bart0sh commented Feb 7, 2023

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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 7, 2023
@pacoxu
Copy link
Copy Markdown
Member

pacoxu commented Feb 8, 2023

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team February 8, 2023 09:33
@Verolop
Copy link
Copy Markdown

Verolop commented Feb 10, 2023

/lgtm

@Verolop Verolop added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 10, 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 Feb 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit 0711382 into kubernetes:release-1.26 Feb 10, 2023
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 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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.

Projects

Development

Successfully merging this pull request may close these issues.

7 participants