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.

Sign up for GitHub

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

[release/1.7] Fix network creation failure from CreatedAt time as 269 years ago #10122

Merged
merged 1 commit into from Apr 23, 2024
Merged

[release/1.7] Fix network creation failure from CreatedAt time as 269 years ago #10122

merged 1 commit into from Apr 23, 2024

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Apr 23, 2024 •
edited

Cherry-pick

There was no merge conflict, but the commit was amended to cover sbserver.

@zzzzzzzzzy9 @AkihiroSuda
pod: CreatedAt time will be 269 years ago while creating cri network …
293f515 
…failed.

   We should set sandbox CreatedAt first time when we create sandbox struct,
   and then set sandbox CreatedAt second time after container started.

   Before this commit, we just set sandbox CreatedAt after container
   started, but if network create failed, the sandbox time is the
   default time, which is 269 years ago, so we need to set sandbox
   CreatedAt at first, even if an error occurred before start container.

Signed-off-by: zzzzzzzzzy9 <zhang.yu58@zte.com.cn>
(cherry picked from commit b16d467)
There was no merge conflict, but the commit was amended to cover
sbserver.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda mentioned this pull request Apr 23, 2024
Closed
@dmcgowan dmcgowan merged commit 733d456 into containerd:release/1.7 Apr 23, 2024
57 checks passed
@kiashok kiashok mentioned this pull request Apr 24, 2024
Merged
@dmcgowan dmcgowan changed the title [release/1.7] pod: CreatedAt time will be 269 years ago while creating cri network failed. [release/1.7] Fix network creation failure from CreatedAt time as 269 years ago Apr 24, 2024
@dmcgowan dmcgowan added the area/cri Container Runtime Interface (CRI) label Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@estesp estesp estesp approved these changes

@akhilerm akhilerm akhilerm approved these changes

Assignees
No one assigned
Labels
area/cri Container Runtime Interface (CRI) impact/changelog size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@AkihiroSuda @dmcgowan @estesp @akhilerm @k8s-ci-robot @zzzzzzzzzy9