c8d/pull: Add options for stargz/nydus snapshotters

daemon/containerd/image_pull.go

@@ -7,6 +7,8 @@ import (
 	"github.com/containerd/containerd"
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/platforms"
+	nyduslabel "github.com/containerd/nydus-snapshotter/pkg/label"
+	stargzsource "github.com/containerd/stargz-snapshotter/fs/source"
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/api/types/registry"
@@ -53,6 +55,7 @@ func (i *ImageService) PullImage(ctx context.Context, image, tagOrDigest string,
 		return nil, nil
 	})
 	opts = append(opts, containerd.WithImageHandler(h))
+	opts = i.applySnapshotterOpts(opts, ref)
 
 	finishProgress := showProgress(ctx, jobs, outStream, pullProgress(i.client.ContentStore()))
 	defer finishProgress()
@@ -79,3 +82,21 @@ func (i *ImageService) PullImage(ctx context.Context, image, tagOrDigest string,
 func (i *ImageService) GetRepository(ctx context.Context, ref reference.Named, authConfig *registry.AuthConfig) (distribution.Repository, error) {
 	panic("not implemented")
 }
+
+func (i *ImageService) applySnapshotterOpts(opts []containerd.RemoteOpt, ref reference.Named) []containerd.RemoteOpt {
+	opts = append(opts, containerd.WithPullUnpack)
+	opts = append(opts, containerd.WithPullSnapshotter(i.snapshotter))
+
+	var wrapper func(images.Handler) images.Handler
+	switch i.snapshotter {
+	case "stargz":
+		const prefetch int64 = 10 * 1024 * 1024 // 10MiB
+		wrapper = stargzsource.AppendDefaultLabelsHandlerWrapper(ref.String(), prefetch)
+	case "nydus":
+		wrapper = nyduslabel.AppendLabelsHandlerWrapper(ref.String())
+	}
+	if wrapper != nil {
+		opts = append(opts, containerd.WithImageHandlerWrapper(wrapper))
+	}
+	return opts
+}

vendor.mod

@@ -23,6 +23,8 @@ require (
 	github.com/containerd/containerd v1.6.6
 	github.com/containerd/continuity v0.3.0
 	github.com/containerd/fifo v1.0.0
+	github.com/containerd/nydus-snapshotter v0.3.0-alpha.5
+	github.com/containerd/stargz-snapshotter v0.11.3
 	github.com/containerd/typeurl v1.0.2
 	github.com/coreos/go-systemd/v22 v22.3.2
 	github.com/creack/pty v1.1.11
@@ -100,8 +102,7 @@ require (
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/containerd/go-cni v1.1.6 // indirect
 	github.com/containerd/go-runc v1.0.0 // indirect
-	github.com/containerd/stargz-snapshotter v0.11.3 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.11.3 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.11.4 // indirect
 	github.com/containerd/ttrpc v1.1.0 // indirect
 	github.com/containernetworking/cni v1.1.1 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect

vendor.sum

@@ -280,11 +280,14 @@ github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
 github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY=
+github.com/containerd/nydus-snapshotter v0.3.0-alpha.5 h1:r6x2KjHqlcTiLUEZi8C5S3irTGpqj+1Y/9wdOHsLaVM=
+github.com/containerd/nydus-snapshotter v0.3.0-alpha.5/go.mod h1:zBuYaCIt5l9DBvX89EQBrbp7K8wd2tvpR51KTxodtF8=
 github.com/containerd/stargz-snapshotter v0.11.3 h1:D3PoF563XmOBdtfx2G6AkhbHueqwIVPBFn2mrsWLa3w=
 github.com/containerd/stargz-snapshotter v0.11.3/go.mod h1:2j2EAUyvrLU4D9unYlTIwGhDKQIk74KJ9E71lJsQCVM=
 github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM=
-github.com/containerd/stargz-snapshotter/estargz v0.11.3 h1:k2kN16Px6LYuv++qFqK+JTcYqc8bEVxzGpf8/gFBL5M=
 github.com/containerd/stargz-snapshotter/estargz v0.11.3/go.mod h1:7vRJIcImfY8bpifnMjt+HTJoQxASq7T28MYbP15/Nf0=
+github.com/containerd/stargz-snapshotter/estargz v0.11.4 h1:LjrYUZpyOhiSaU7hHrdR82/RBoxfGWSaC0VeSSMXqnk=
+github.com/containerd/stargz-snapshotter/estargz v0.11.4/go.mod h1:7vRJIcImfY8bpifnMjt+HTJoQxASq7T28MYbP15/Nf0=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=