push: inherit distribution sources from parent
When a blob does not exist locally, rather than erroring on info lookup, inherit the parent distribution sources. Push is able to succeed even if the blob does not exist locally when a cross repository mount is done. This is a common operation pushing a multi-platform image to the same registry but different namespace. Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
parent
24aca53fa0
commit
20f79300cf
@ -204,8 +204,9 @@ func push(ctx context.Context, provider content.Provider, pusher Pusher, desc oc
|
|||||||
// Base handlers can be provided which will be called before any push specific
|
// Base handlers can be provided which will be called before any push specific
|
||||||
// handlers.
|
// handlers.
|
||||||
//
|
//
|
||||||
// If the passed in content.Provider is also a content.Manager then this will
|
// If the passed in content.Provider is also a content.InfoProvider (such as
|
||||||
// also annotate the distribution sources in the manager.
|
// content.Manager) then this will also annotate the distribution sources using
|
||||||
|
// labels prefixed with "containerd.io/distribution.source".
|
||||||
func PushContent(ctx context.Context, pusher Pusher, desc ocispec.Descriptor, store content.Provider, limiter *semaphore.Weighted, platform platforms.MatchComparer, wrapper func(h images.Handler) images.Handler) error {
|
func PushContent(ctx context.Context, pusher Pusher, desc ocispec.Descriptor, store content.Provider, limiter *semaphore.Weighted, platform platforms.MatchComparer, wrapper func(h images.Handler) images.Handler) error {
|
||||||
|
|
||||||
var m sync.Mutex
|
var m sync.Mutex
|
||||||
@ -234,7 +235,7 @@ func PushContent(ctx context.Context, pusher Pusher, desc ocispec.Descriptor, st
|
|||||||
platformFilterhandler := images.FilterPlatforms(images.ChildrenHandler(store), platform)
|
platformFilterhandler := images.FilterPlatforms(images.ChildrenHandler(store), platform)
|
||||||
|
|
||||||
var handler images.Handler
|
var handler images.Handler
|
||||||
if m, ok := store.(content.Manager); ok {
|
if m, ok := store.(content.InfoProvider); ok {
|
||||||
annotateHandler := annotateDistributionSourceHandler(platformFilterhandler, m)
|
annotateHandler := annotateDistributionSourceHandler(platformFilterhandler, m)
|
||||||
handler = images.Handlers(annotateHandler, filterHandler, pushHandler)
|
handler = images.Handlers(annotateHandler, filterHandler, pushHandler)
|
||||||
} else {
|
} else {
|
||||||
@ -340,14 +341,15 @@ func FilterManifestByPlatformHandler(f images.HandlerFunc, m platforms.Matcher)
|
|||||||
|
|
||||||
// annotateDistributionSourceHandler add distribution source label into
|
// annotateDistributionSourceHandler add distribution source label into
|
||||||
// annotation of config or blob descriptor.
|
// annotation of config or blob descriptor.
|
||||||
func annotateDistributionSourceHandler(f images.HandlerFunc, manager content.Manager) images.HandlerFunc {
|
func annotateDistributionSourceHandler(f images.HandlerFunc, provider content.InfoProvider) images.HandlerFunc {
|
||||||
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
return func(ctx context.Context, desc ocispec.Descriptor) ([]ocispec.Descriptor, error) {
|
||||||
children, err := f(ctx, desc)
|
children, err := f(ctx, desc)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// only add distribution source for the config or blob data descriptor
|
// Distribution source is only used for config or blob but may be inherited from
|
||||||
|
// a manifest or manifest list
|
||||||
switch desc.MediaType {
|
switch desc.MediaType {
|
||||||
case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest,
|
case images.MediaTypeDockerSchema2Manifest, ocispec.MediaTypeImageManifest,
|
||||||
images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
|
images.MediaTypeDockerSchema2ManifestList, ocispec.MediaTypeImageIndex:
|
||||||
@ -355,13 +357,29 @@ func annotateDistributionSourceHandler(f images.HandlerFunc, manager content.Man
|
|||||||
return children, nil
|
return children, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parentInfo can be used to inherit info for non-existent blobs
|
||||||
|
var parentInfo *content.Info
|
||||||
|
|
||||||
for i := range children {
|
for i := range children {
|
||||||
child := children[i]
|
child := children[i]
|
||||||
|
|
||||||
info, err := manager.Info(ctx, child.Digest)
|
info, err := provider.Info(ctx, child.Digest)
|
||||||
|
if err != nil {
|
||||||
|
if !errdefs.IsNotFound(err) {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if parentInfo == nil {
|
||||||
|
pi, err := provider.Info(ctx, desc.Digest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
parentInfo = &pi
|
||||||
|
}
|
||||||
|
// Blob may not exist locally, annotate with parent labels for cross repo
|
||||||
|
// mount or fetch. Parent sources may apply to all children since most
|
||||||
|
// registries enforce that children exist before the manifests.
|
||||||
|
info = *parentInfo
|
||||||
|
}
|
||||||
|
|
||||||
for k, v := range info.Labels {
|
for k, v := range info.Labels {
|
||||||
if !strings.HasPrefix(k, labels.LabelDistributionSource+".") {
|
if !strings.HasPrefix(k, labels.LabelDistributionSource+".") {
|
||||||
|
Loading…
Reference in New Issue
Block a user