Skip to content

Merge cri master#4593

Merged
AkihiroSuda merged 2074 commits intocontainerd:masterfrom
dmcgowan:merge-cri
Oct 7, 2020
Merged

Merge cri master#4593
AkihiroSuda merged 2074 commits intocontainerd:masterfrom
dmcgowan:merge-cri

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Testing the merge listed in #4592

Going to try and script out the creation of this merge but want to see where our CI falls over first.

mikebrow and others added 30 commits April 15, 2020 11:59
Signed-off-by: Mike Brown <[email protected]>
Running critest under windows using github action
fixes bad unit test when selinux is enabled
reload cni network config if has fs change events
docker-ce seems to be building runc with selinux support, let us follow
the same pattern here please:
https://github.com/docker/docker-ce/search?p=1&q=RUNC_BUILDTAGS&unscoped_q=RUNC_BUILDTAGS

Signed-off-by: Davanum Srinivas <[email protected]>
Since containerd#3728
The docker/distribution/reference package is copied into containerd core

Signed-off-by: Shengjing Zhu <[email protected]>
Replace docker/distribution/reference with containerd/reference/docker
Along with type(Sandbox or Container) and Sandbox name annotations
provide support for additional annotation:
  - Container name

This will help us perform per container operation by comparing it
with pass through annotations (eg. pod metadata annotations from K8s)

Signed-off-by: Chethan Suresh <[email protected]>
…b-actions

adds git hub actions for linux CI
…pshots

Throughout container lifecycle, pulling image is one of the time-consuming
steps. Recently, containerd community started to tackle this issue with
stargz-based remote snapshots, as a non-core
subproject(https://github.com/containerd/stargz-snapshotter).

This snapshotter is implemented as a standard proxy plugin but it requires the
client to pass some additional information (image ref and layer digest) for each
pull operation to query layer contents on the registry. Stargz snapshotter
project provides an image handler to do this and stargz snapshot users need to
pass this handler to containerd client.

This commit enables to use stargz-based remote snapshots through CRI by passing
the handler to containerd client on pull operation.

Signed-off-by: Kohei Tokunaga <[email protected]>
Enable to pass additional handler on pull for stargz-based remote snapshots
have moved these tests to github actions
add default scheme when mirrors no scheme
…build-and-test

split tests and some refactoring
…annot

Support for additional OCI annotations: 'container-name'
…ion-for-make

use project dco test locally
Signed-off-by: Derek McGowan <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 6, 2020

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 6, 2020

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 6, 2020

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 6, 2020

Build succeeded.

@dmcgowan dmcgowan marked this pull request as ready for review October 6, 2020 20:23
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 6, 2020

Build succeeded.

@dmcgowan
Copy link
Copy Markdown
Member Author

dmcgowan commented Oct 6, 2020

In terms of the commits included in this to help review, we have...

  • 2000+ commits from CRI master
  • 1 commit to prepare CRI to be mergeable into containerd (removing duplicated files and moving locations)
  • 1 merge commit, using unrelated branch merge
  • 1 commit to update containerd to use local version of CRI packages

These commits were generated by https://gist.github.com/dmcgowan/8d2d6e23f1cc830cfbff1e9abd57e262 so it can be continually rebased on CRI master

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see ./contrib/ansible docs still have references to github.com/containerd/cri, but let's merge this PR as-is right now, and address trivial issues in follow-up PRs.

LGTM

Copy link
Copy Markdown
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

image

@dmcgowan
Copy link
Copy Markdown
Member Author

dmcgowan commented Oct 7, 2020

Going to push one more rebase on cri master since there was a merge this morning there

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 7, 2020

Build succeeded.

@dims
Copy link
Copy Markdown
Member

dims commented Oct 7, 2020

same boat as @mxpv :) LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.