-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[release-1.25] When crio restarts, restore the infraContainer #7773
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.25] When crio restarts, restore the infraContainer #7773
Conversation
Signed-off-by: dsxing <[email protected]>
|
|
||
| // Then | ||
| Expect(err).To(BeNil()) | ||
| Expect(sut.GetInfraContainer(sandboxID)).NotTo(BeNil()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To the reviewer:
Updated for CRI-O 1.25 to resolve the following function signature difference:
# github.com/cri-o/cri-o/internal/lib_test [github.com/cri-o/cri-o/internal/lib.test]
./container_server_test.go:169:55: too many arguments in call to sut.GetInfraContainer
have ("context".Context, string)
want (string)| } | ||
|
|
||
| // We should restore the infraContainer to the container state store | ||
| c.AddInfraContainer(scontainer) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To the reviewer:
Updated for CRI-O 1.25 to resolve the following function signature difference:
# github.com/cri-o/cri-o/internal/lib
Error: internal/lib/container_server.go:285:27: too many arguments in call to c.AddInfraContainer
have (context.Context, *oci.Container)
want (*oci.Container)|
/approve |
|
@kwilczynski: you cannot LGTM your own PR. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## release-1.25 #7773 +/- ##
=============================================
Coverage 43.61% 43.62%
=============================================
Files 122 122
Lines 13708 13709 +1
=============================================
+ Hits 5979 5980 +1
Misses 7091 7091
Partials 638 638 |
|
/retest-required |
|
@cri-o/cri-o-maintainers, please have a look. Thank you! |
saschagrunert
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/hold
Feel free to unhold when the backport is ready to go.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kwilczynski, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/unhold |
This is a manual cherry-pick of #7726
/kind bug
/assign kwilczynski