From 1301813f7ad147d51086ae5e7ad3dce6e3a43391 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 26 Oct 2018 13:52:32 -0400 Subject: [PATCH] Update ZFS for unsupported warnings Signed-off-by: Michael Crosby --- vendor.conf | 2 +- vendor/github.com/containerd/zfs/zfs.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor.conf b/vendor.conf index dbc3eecd9..0c8b5c914 100644 --- a/vendor.conf +++ b/vendor.conf @@ -81,7 +81,7 @@ k8s.io/kubernetes v1.12.0 k8s.io/utils cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb # zfs dependencies -github.com/containerd/zfs 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec +github.com/containerd/zfs 9f6ef3b1fe5144bd91fe5855b4eba81bc0d17d03 github.com/mistifyio/go-zfs 166add352731e515512690329794ee593f1aaff2 github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd diff --git a/vendor/github.com/containerd/zfs/zfs.go b/vendor/github.com/containerd/zfs/zfs.go index 0b3cd7814..cbd232bb7 100644 --- a/vendor/github.com/containerd/zfs/zfs.go +++ b/vendor/github.com/containerd/zfs/zfs.go @@ -50,7 +50,7 @@ func NewSnapshotter(root string) (snapshots.Snapshotter, error) { return nil, err } if m.FSType != "zfs" { - return nil, errors.Errorf("path %s must be a zfs filesystem to be used with the zfs snapshotter", root) + return nil, errors.Wrapf(plugin.ErrSkipPlugin, "path %s must be a zfs filesystem to be used with the zfs snapshotter", root) } dataset, err := zfs.GetDataset(m.Source) if err != nil {