[nydus] Propagate mergeManifest to snapshotter converter

Fricounet · imeoer · commit 91fc3940276e · 2025-09-09T16:19:22.000+08:00
Use MergeOption.MergeManifest introduced in nydus-snapshotter v0.15.3 (containerd/nydus-snapshotter#674) Signed-off-by: Baptiste Girard-Carrabin <baptiste.girardcarrabin@datadoghq.com>
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/containerd/containerd/v2 v2.0.2
 	github.com/containerd/errdefs v1.0.0
 	github.com/containerd/log v0.1.0
-	github.com/containerd/nydus-snapshotter v0.15.2
+	github.com/containerd/nydus-snapshotter v0.15.3
 	github.com/containerd/platforms v1.0.0-rc.1
 	github.com/containerd/stargz-snapshotter v0.16.3
 	github.com/containerd/stargz-snapshotter/estargz v0.16.3
diff --git a/go.sum b/go.sum
@@ -73,8 +73,8 @@ github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY
 github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/containerd/nydus-snapshotter v0.15.2 h1:qsHI4M+Wwrf6Jr4eBqhNx8qh+YU0dSiJ+WPmcLFWNcg=
-github.com/containerd/nydus-snapshotter v0.15.2/go.mod h1:FfwH2KBkNYoisK/e+KsmNr7xTU53DmnavQHMFOcXwfM=
+github.com/containerd/nydus-snapshotter v0.15.3 h1:dgeroRQnfgpTgnw2MgsWZCHr71bDbZhlH7cHD4FebHI=
+github.com/containerd/nydus-snapshotter v0.15.3/go.mod h1:eRJqnxQDr48HNop15kZdLZpFF5B6vf6Q11Aq1K0E4Ms=
 github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E=
 github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
 github.com/containerd/plugin v1.0.0 h1:c8Kf1TNl6+e2TtMHZt+39yAPDbouRH9WAToRjex483Y=
diff --git a/pkg/driver/nydus/nydus.go b/pkg/driver/nydus/nydus.go
@@ -290,6 +290,7 @@ func (d *Driver) convert(ctx context.Context, provider accelcontent.Provider, so
 		OCIRef:           packOpt.OCIRef,
 		Encrypt:          encrypter,
 		WithReferrer:     d.withReferrer,
+		MergeManifest:    d.mergeManifest,
 	}
 	convertHookFunc := func(
 		ctx context.Context, cs content.Store, orgDesc ocispec.Descriptor, newDesc *ocispec.Descriptor,

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ func (d *Driver) convert(ctx context.Context, provider accelcontent.Provider, so`
`290`	`290`	`OCIRef: packOpt.OCIRef,`
`291`	`291`	`Encrypt: encrypter,`
`292`	`292`	`WithReferrer: d.withReferrer,`
	`293`	`+ MergeManifest: d.mergeManifest,`
`293`	`294`	`}`
`294`	`295`	`convertHookFunc := func(`
`295`	`296`	`ctx context.Context, cs content.Store, orgDesc ocispec.Descriptor, newDesc *ocispec.Descriptor,`