Move DefaultSnapshotter constants

Move the DefaultSnapshotter constants to the defaults package.
Fixes issue #8226.

Signed-off-by: James Jenkins <James.Jenkins@ibm.com>
This commit is contained in:
James Jenkins
2023-04-05 11:59:54 -04:00
parent 0a7c192ca9
commit 8aa2551ce0
16 changed files with 35 additions and 31 deletions

View File

@@ -40,6 +40,7 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
@@ -476,7 +477,7 @@ func initLocalCRIImageService(client *containerd.Client, tmpDir string, registry
containerdRootDir := filepath.Join(tmpDir, "root")
cfg := criconfig.ImageConfig{
Snapshotter: containerd.DefaultSnapshotter,
Snapshotter: defaults.DefaultSnapshotter,
Registry: registryCfg,
ImagePullProgressTimeout: defaultImagePullProgressTimeout.String(),
StatsCollectPeriod: 10,
@@ -484,7 +485,7 @@ func initLocalCRIImageService(client *containerd.Client, tmpDir string, registry
return images.NewService(cfg, &images.CRIImageServiceOptions{
ImageFSPaths: map[string]string{
containerd.DefaultSnapshotter: containerdRootDir,
defaults.DefaultSnapshotter: containerdRootDir,
},
RuntimePlatforms: map[string]images.ImagePlatform{},
Content: client.ContentStore(),