From bdc5af86008c947d63cf982976775b9967e7e009 Mon Sep 17 00:00:00 2001 From: Paul Gaiduk Date: Fri, 18 Oct 2024 18:50:21 +0200 Subject: [PATCH] remove zfs snapshotter in containerd ZFS snapshotter is not used in containerd, as the snapshotting for ZFS is done by the ZFS filesystem itself. This commit removes the ZFS snapshotter from the containerd configuration. Signed-off-by: Paul Gaiduk (cherry picked from commit e352fd2276fb94b1b545c8e72420c4ee4ded8e76) --- pkg/pillar/containerd/containerd.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/pillar/containerd/containerd.go b/pkg/pillar/containerd/containerd.go index 1454b234e6..b8ebfbfa19 100644 --- a/pkg/pillar/containerd/containerd.go +++ b/pkg/pillar/containerd/containerd.go @@ -32,7 +32,6 @@ import ( "github.com/lf-edge/edge-containers/pkg/resolver" "github.com/lf-edge/eve/pkg/pillar/base" "github.com/lf-edge/eve/pkg/pillar/types" - "github.com/lf-edge/eve/pkg/pillar/utils/persist" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" runtimespecs "github.com/opencontainers/runtime-spec/specs-go" @@ -98,10 +97,6 @@ func GetServicesNamespace() string { func init() { logrus.Info("Containerd Init") - // see if we need to use zfs snapshotter based on what flavor of storage persist partition is - if persist.ReadPersistType() == types.PersistZFS { - defaultSnapshotter = types.ZFSSnapshotter - } if base.IsHVTypeKube() { defaultSnapshotter = "overlayfs"