e2e: add upgrade to make sure compatiliblity with 1.x #11761
e2e: add upgrade to make sure compatiliblity with 1.x #11761yylt wants to merge 2 commits intocontainerd:mainfrom
Conversation
Signed-off-by: yang yang <[email protected]>
|
Hi @yylt. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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-sigs/prow repository. |
dosubot
Bot
added
area/cri
yylt
force-pushed
the
s
branch
10 times, most recently
from
d318e61 to
4953164
Compare
| if !errors.Is(sbErr, errdefs.ErrNotFound) { | ||
| return nil, sbErr | ||
| } | ||
| log.G(ctx).WithField("id", opts.SandboxID).Warning("not found sandbox, maybe created from v1.x") |
| shouldv2 bool | ||
| ) | ||
| if opts.SandboxID != "" { | ||
| sbx, sbErr := m.sandboxStore.Get(ctx, opts.SandboxID) |
There was a problem hiding this comment.
For context, is this sandbox store not being used in 1.X? How (or where) are sandboxes stored in those branches?
There was a problem hiding this comment.
Here, sandboxStore points to the metadata sandbox, which was introduced in 2.0 through the sandbox API. The creation and update of this part are done in the sandbox_run of cri. see https://github.com/containerd/containerd/blob/1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20/internal/cri/server/sandbox_run.go#L135C1-L137C3
cri create/update both cache and metadata sandbox data structures, which may be the reason for your confusion
Signed-off-by: yang yang <[email protected]>
yylt
changed the title
github-project-automation
Bot
moved this from Needs Triage
to Done
in Pull Request Review
3 participants
Fix #11535
Add e2e testing, mainly including the following
containerd-shim runc-v2andcontainerd-shim runc-v1To ensure the success of e2e, some modifications have been made, roughly as follows
1 rewrite the #11735, as the comment describe, it is also follow-up
2 use clientv2 which the corresponding sandbox is created by 1.x.