Merge CRI code into upstream containerd

[crosbymichael]

I think it's time we merge the two. The CRI API is a very important entry point for the containerd project and they are shipped as one. I don't think these two need to be split codebases any longer.

How hard is it to move the tests to the main containerd repo?

[mikebrow]

Might not be too bad have been making a lot of changes of late to get us there. Chatted with @dmcgowan about it in passing yesterday :-)

[dmcgowan]

This repo does have the k8s bot, setting up permission and webhooks on the main repo would be easy.

The test infra configuration is in this repo, https://github.com/kubernetes/test-infra/search?q=%22containerd%2Fcri%22&type=Code

I am a bit concerned about supporting release branches though. If the k8s tests build from another repository, will that make older branches without testing. Or would those changes just be able to be tested when they are vendored back into containerd. Setting a whole new configuration to test both repos doesn't seem very easy.

Let me call over the experts to opine here
@spiffxp @Random-Liu @dims

[dims]

@crosbymichael @dmcgowan i'd like to get there. we need to clean up k8s.io/kubernetes <-> containerd/cri first. some experiments are here:

• Separate out cri related code into self contained package kubernetes/kubernetes#90552
• Remove dependencies on k8s.io/kubernetes #1463

It's not too bad to rework the test-infra configuration to switch over as well. agree that we need to figure out the test matrix (which k8s branches against which containerd branches) etc. Let's see how quickly we can make progress on the dependency first.

[mikebrow]

Chatted with @dims offline, this isn't a blocker so to speak, just one of the many clean ups that would be nice to get done and can happen in /cri or /containerd.

[dims]

Agree!

[jterry75]

Agree! @kevpar - You may want to get the WCOW changes PR'd or wait to do against containerd post this.

[crosbymichael]

I think we should start on this after the 1.4 release. We can do a 1.5 milestone for this and have it as the only item.

[dims]

Sounds like a plan!

[AkihiroSuda]

The content of this containerd/crirepo was merged to containerd/containerd repo: containerd/containerd#4593

containerd/cri repo no longer accepts issues and PRs except backports.