Skip to content

[release/1.5] CRI: Fix no CNI info for pod sandbox on restart#7849

Merged
samuelkarp merged 1 commit intocontainerd:release/1.5from
dcantah:fix-noip-1.5
Dec 21, 2022
Merged

[release/1.5] CRI: Fix no CNI info for pod sandbox on restart#7849
samuelkarp merged 1 commit intocontainerd:release/1.5from
dcantah:fix-noip-1.5

Conversation

@dcantah
Copy link
Copy Markdown
Member

@dcantah dcantah commented Dec 20, 2022

🍒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.

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 dcantah added area/cri Container Runtime Interface (CRI) cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch labels Dec 20, 2022
@dmcgowan dmcgowan removed the cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch label Dec 20, 2022
@samuelkarp samuelkarp merged commit 24e3ded into containerd:release/1.5 Dec 21, 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) impact/changelog kind/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants