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

[release/1.5] cri: PodSandboxStatus should tolerate missing task #7552

Merged
merged 1 commit into from
Oct 18, 2022

Conversation

samuelkarp
Copy link
Member

Backport of #7535

Resolved conflicts in cherry pick:

  • sbserver - deleted file
  • fmt.Errorf vs errors.Wrap

Signed-off-by: Samuel Karp <samuelkarp@google.com>
(cherry picked from commit 8903986)
Signed-off-by: Samuel Karp <samuelkarp@google.com>
@samuelkarp samuelkarp added the area/cri Container Runtime Interface (CRI) label Oct 18, 2022
@samuelkarp samuelkarp changed the title cri: PodSandboxStatus should tolerate missing task [release/1.6] cri: PodSandboxStatus should tolerate missing task Oct 18, 2022
@samuelkarp samuelkarp changed the title [release/1.6] cri: PodSandboxStatus should tolerate missing task [release/1.5] cri: PodSandboxStatus should tolerate missing task Oct 18, 2022
@estesp
Copy link
Member

estesp commented Oct 18, 2022

/test pull-containerd-node-e2e

@dmcgowan dmcgowan merged commit f4ea789 into containerd:release/1.5 Oct 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cri Container Runtime Interface (CRI)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants