From bbc8b6dc6f87457837c25649ced96f4a1d24b571 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 19 Sep 2019 17:23:56 -0700 Subject: [PATCH] exporter: remove label based linking Signed-off-by: Tonis Tiigi --- exporter/containerimage/writer.go | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/exporter/containerimage/writer.go b/exporter/containerimage/writer.go index 66d9016f..22546555 100644 --- a/exporter/containerimage/writer.go +++ b/exporter/containerimage/writer.go @@ -100,9 +100,7 @@ func (ic *ImageWriter) Commit(ctx context.Context, inp exporter.Source, oci bool idx.MediaType = images.MediaTypeDockerSchema2ManifestList } - labels := map[string]string{} - - for i, p := range p.Platforms { + for _, p := range p.Platforms { r, ok := inp.Refs[p.ID] if !ok { return nil, errors.Errorf("failed to find ref for ID %s", p.ID) @@ -116,8 +114,6 @@ func (ic *ImageWriter) Commit(ctx context.Context, inp exporter.Source, oci bool dp := p.Platform desc.Platform = &dp idx.Manifests = append(idx.Manifests, *desc) - - labels[fmt.Sprintf("containerd.io/gc.ref.content.%d", i)] = desc.Digest.String() } idxBytes, err := json.MarshalIndent(idx, "", " ") @@ -133,18 +129,11 @@ func (ic *ImageWriter) Commit(ctx context.Context, inp exporter.Source, oci bool } idxDone := oneOffProgress(ctx, "exporting manifest list "+idxDigest.String()) - if err := content.WriteBlob(ctx, ic.opt.ContentStore, idxDigest.String(), bytes.NewReader(idxBytes), idxDesc, content.WithLabels(labels)); err != nil { + if err := content.WriteBlob(ctx, ic.opt.ContentStore, idxDigest.String(), bytes.NewReader(idxBytes), idxDesc); err != nil { return nil, idxDone(errors.Wrapf(err, "error writing manifest list blob %s", idxDigest)) } idxDone(nil) - for _, desc := range idx.Manifests { - // delete manifest root. manifest will remain linked to the index - if err := ic.opt.ContentStore.Delete(context.TODO(), desc.Digest); err != nil { - return nil, errors.Wrap(err, "error removing manifest root") - } - } - return &idxDesc, nil } @@ -229,11 +218,7 @@ func (ic *ImageWriter) commitDistributionManifest(ctx context.Context, ref cache }, } - labels := map[string]string{ - "containerd.io/gc.ref.content.0": configDigest.String(), - } - - for i, dp := range diffPairs { + for _, dp := range diffPairs { info, err := ic.opt.ContentStore.Info(ctx, dp.Blobsum) if err != nil { return nil, errors.Wrapf(err, "could not find blob %s from contentstore", dp.Blobsum) @@ -243,7 +228,6 @@ func (ic *ImageWriter) commitDistributionManifest(ctx context.Context, ref cache Size: info.Size, MediaType: layerType, }) - labels[fmt.Sprintf("containerd.io/gc.ref.content.%d", i+1)] = dp.Blobsum.String() } mfstJSON, err := json.MarshalIndent(mfst, "", " ") @@ -258,7 +242,7 @@ func (ic *ImageWriter) commitDistributionManifest(ctx context.Context, ref cache } mfstDone := oneOffProgress(ctx, "exporting manifest "+mfstDigest.String()) - if err := content.WriteBlob(ctx, ic.opt.ContentStore, mfstDigest.String(), bytes.NewReader(mfstJSON), mfstDesc, content.WithLabels(labels)); err != nil { + if err := content.WriteBlob(ctx, ic.opt.ContentStore, mfstDigest.String(), bytes.NewReader(mfstJSON), mfstDesc); err != nil { return nil, mfstDone(errors.Wrapf(err, "error writing manifest blob %s", mfstDigest)) } mfstDone(nil) @@ -275,11 +259,6 @@ func (ic *ImageWriter) commitDistributionManifest(ctx context.Context, ref cache } configDone(nil) - // delete config root. config will remain linked to the manifest - if err := ic.opt.ContentStore.Delete(context.TODO(), configDigest); err != nil { - return nil, errors.Wrap(err, "error removing config root") - } - return &ocispec.Descriptor{ Digest: mfstDigest, Size: int64(len(mfstJSON)),