I'm including the vendor updates here for tests. If the maintainers are OK with this package naming, I'll open a PR on containerd/cri to match.

Ya, looks good. Ping @Random-Liu for a heads up on the CRI import changes .

I'll open a PR on containerd/cri to match.

The vendor.conf will need to point at your fork and the commit with the change to get CI passing. Once it is merged in CRI then another PR can be open to remove the use of the fork and update CRI. I usually point at a commit which is based on the version correctly in the vendor.conf to avoid pulling in additional unrelated changes.

@crosbymichael Will update containerd vendor for this.

@Random-Liu I think @ehazlett will make the PR, I just wanted to give you a heads up with the change.

oops, missed that comment. Yeah, the naming change LGTM. :)

Feel free to send a PR to containerd/cri.

@dmcgowan thanks!

@Random-Liu ya i'll do the vendor update. thanks!

Seems there was a network error, I've restarted the job

The windows failure is probably not related, looks like a previous test may not have been cleaned up correctly. I'll restart the job to see

Codecov Report

Merging #2353 into master will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master   #2353   +/-   ##
======================================
  Coverage    41.4%   41.4%           
======================================
  Files          66      66           
  Lines        7805    7805           
======================================
  Hits         3232    3232           
  Misses       4069    4069           
  Partials      504     504

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 80bbaff...6653917. Read the comment docs.

LGTM