[release/1.6] CRI: Fix no CNI info for pod sandbox on restart#7848
Merged
dmcgowan merged 1 commit intocontainerd:release/1.6from Dec 20, 2022
Merged
[release/1.6] CRI: Fix no CNI info for pod sandbox on restart#7848dmcgowan merged 1 commit intocontainerd:release/1.6from
dmcgowan merged 1 commit intocontainerd:release/1.6from
Conversation
Due to when we were updating the pod sandboxes underlying container object, the pointer to the sandbox would have the right info, but the on-disk representation of the data was behind. This would cause the data returned from loading any sandboxes after a restart to have no CNI result or IP information for the pod. This change does an additional update to the on-disk container info right after we invoke the CNI plugin so the metadata for the CNI result and other networking information is properly flushed to disk. Signed-off-by: Danny Canter <[email protected]> (cherry picked from commit 3ee6dd5) Signed-off-by: Danny Canter <[email protected]>
dcantah
added
area/cri
dmcgowan
removed
the
cherry-picked/1.6.x
Member
Author
|
Oop, misused the cherry-picked label; thanks Derek! |
samuelkarp
approved these changes
Dec 20, 2022
dmcgowan
approved these changes
Dec 20, 2022
Mengkzhaoyun
pushed a commit
to open-beagle/containerd
that referenced
this pull request
Jan 16, 2023
containerd 1.6.15 Welcome to the v1.6.15 release of containerd! The fifteenth patch release for containerd 1.6 fixes an issue with CNI in the CRI plugin * **Fix no CNI info for pod sandbox on restart in CRI plugin** ([#7848](containerd/containerd#7848)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Akihiro Suda * Danny Canter * Kevin Parsons * Samuel Karp * Wei Fu <details><summary>8 commits</summary> <p> * [release/1.6] Prepare release notes for v1.6.15 ([#7924](containerd/containerd#7924)) * [`883899eae`](containerd/containerd@883899e) Prepare release notes for v1.6.15 * [release/1.6] CI: Pass GITHUB_TOKEN to containerd/project-checks ([#7919](containerd/containerd#7919)) * [`b57367020`](containerd/containerd@b573670) CI: Pass GITHUB_TOKEN to containerd/project-checks * [release/1.6] integration/images: switch away from Docker Hub to avoid rate limit ([#7900](containerd/containerd#7900)) * [`0f4062c9b`](containerd/containerd@0f4062c) integration/images: switch away from Docker Hub to avoid rate limit * [release/1.6] CRI: Fix no CNI info for pod sandbox on restart ([#7848](containerd/containerd#7848)) * [`f16447e2d`](containerd/containerd@f16447e) CRI: Fix no CNI info for pod sandbox on restart </p> </details> This release has no dependency changes Previous release can be found at [v1.6.14](https://github.com/containerd/containerd/releases/tag/v1.6.14)
4 tasks
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🍒pick: 3ee6dd5
Due to when we were updating the pod sandboxes underlying container object, the pointer to the sandbox would have the right info, but the on-disk representation of the data was behind. This would cause the data returned from loading any sandboxes after a restart to have no CNI result or IP information for the pod.
This change does an additional update to the on-disk container info right after we invoke the CNI plugin so the metadata for the CNI result and other networking information is properly flushed to disk.