Release binary update for imgcrypt#5498
Merged
dmcgowan merged 8 commits intocontainerd:masterfrom May 13, 2021
Merged
Conversation
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 15e0bd5) Signed-off-by: Sebastiaan van Stijn <[email protected]>
This forces vendoring to only take dependencies of this repository to be taken into account, effectively cutting the circular dependency (for the vendored code), and to prevent depending on transitive dependencies coming from older versions of containerd. go mod does not allow using the main module as a local "replace" rule using a path; see golang/go#45492 and golang/go#34417, so instead, an empty module is used. One change observed is that older versions containerd depended on an older version of imgcrypt that had an "indirect" dependency on more current versions of gopkg.in/yaml.v2 and prometheus/procfs. For those, a temporary "indirect" dependency was added, until prometheus/client_golang and kubernetes are updated. from go mod graph (before): github.com/containerd/[email protected] gopkg.in/[email protected] github.com/containerd/[email protected] github.com/prometheus/[email protected] For some reason, some older versions of containerd are still taken into account, causing satori/go.uuid to be added as "indirect" dependency, likely because some modules have this dependency in their go.sum. This should likely disappear once those plugins are updated to contain a current version of containerd. git grep 'github.com/satori/go.uuid' vendor/github.com/Microsoft/hcsshim/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= vendor/github.com/containerd/aufs/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= vendor/github.com/containerd/imgcrypt/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= vendor/github.com/containerd/nri/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= vendor/github.com/containerd/zfs/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit e26fc84) Signed-off-by: Sebastiaan van Stijn <[email protected]>
…oop_da_loop [release/1.5] go.mod: cut circular dependency on github.com/containerd/containerd
Member
Author
|
/cc @AkihiroSuda @lumjjb |
|
Build succeeded.
|
Member
Author
|
...mirror.gcr.io/library/alpine:latest: not found hurts my head :-) |
Signed-off-by: Mike Brown <[email protected]>
mikebrow
force-pushed
the
release-binary-update-for-imgcrypt
branch
from
099fb14 to
3157392
Compare
|
Build succeeded.
|
dmcgowan
approved these changes
May 13, 2021
thaJeztah
added
cherry-picked/1.5.x
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
5 participants
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.
we are currently shipping in the cni tar.gz one of the test only binaries from the imgcrypt repo... (ctr-enc)
see containerd/imgcrypt#48
This PR switches to only release ... ctd-decoder
after this pr: