Merge cri master#4593
Merged
AkihiroSuda merged 2074 commits intocontainerd:masterfrom Oct 7, 2020
Merged
Conversation
Signed-off-by: Mike Brown <[email protected]>
Signed-off-by: Mike Brown <[email protected]>
Signed-off-by: Davanum Srinivas <[email protected]>
Running critest under windows using github action
…ing-action Create greetings.yml
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]>
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]>
Signed-off-by: Shengjing Zhu <[email protected]>
…support Build runc with selinux support
Replace docker/distribution/reference with containerd/reference/docker
Signed-off-by: Mike Brown <[email protected]>
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
Signed-off-by: Mike Brown <[email protected]>
…first Signed-off-by: Mike Brown <[email protected]>
have moved these tests to github actions
Signed-off-by: yang yang <[email protected]>
add default scheme when mirrors no scheme
Signed-off-by: Mike Brown <[email protected]>
…build-and-test split tests and some refactoring
…annot Support for additional OCI annotations: 'container-name'
Signed-off-by: Mike Brown <[email protected]>
Signed-off-by: Joris De Winne <[email protected]>
Update registry.md for auth config
…ion-for-make use project dco test locally
Signed-off-by: Derek McGowan <[email protected]>
|
Build succeeded.
|
|
Build succeeded.
|
|
Build succeeded.
|
Fix unix lint
|
Build succeeded.
|
|
Build succeeded.
|
Member
Author
|
In terms of the commits included in this to help review, we have...
These commits were generated by https://gist.github.com/dmcgowan/8d2d6e23f1cc830cfbff1e9abd57e262 so it can be continually rebased on CRI master |
AkihiroSuda
approved these changes
Oct 7, 2020
Member
AkihiroSuda
left a comment
There was a problem hiding this comment.
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
Add missing sandbox labels when invoking nri
Signed-off-by: Derek McGowan <[email protected]>
Signed-off-by: Derek McGowan <[email protected]>
Signed-off-by: Derek McGowan <[email protected]>
Member
Author
|
Going to push one more rebase on cri master since there was a merge this morning there |
|
Build succeeded.
|
Member
|
same boat as @mxpv :) LGTM |
AkihiroSuda
approved these changes
Oct 7, 2020
This was referenced Oct 10, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

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.