From 330a2a80925776f0eeb44e8627b4033db17e9d6e Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 16 Apr 2021 15:08:10 -0700 Subject: [PATCH 1/2] go.mod: github.com/containerd/zfs Signed-off-by: Samuel Karp --- go.mod | 2 +- go.sum | 2 ++ vendor/github.com/containerd/zfs/plugin/plugin.go | 5 +++-- vendor/modules.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index cd53b624f..50a4a8a8d 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14 github.com/containerd/ttrpc v1.0.2 github.com/containerd/typeurl v1.0.2 - github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433 + github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87 github.com/containernetworking/plugins v0.9.1 github.com/coreos/go-systemd/v22 v22.1.0 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index eba2b2c90..91f674c5c 100644 --- a/go.sum +++ b/go.sum @@ -169,6 +169,8 @@ github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQ github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433 h1:oFJf1mMvgJAt2QwgEsXLMQK/qRTY8JXwsCV7No1uCb8= github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= +github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87 h1:04tsitu/xTkLWo80gnw+R8jhAEKjuuvt/NL7B1bMLWU= +github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI= diff --git a/vendor/github.com/containerd/zfs/plugin/plugin.go b/vendor/github.com/containerd/zfs/plugin/plugin.go index 512cf9443..2967f2fa3 100644 --- a/vendor/github.com/containerd/zfs/plugin/plugin.go +++ b/vendor/github.com/containerd/zfs/plugin/plugin.go @@ -31,8 +31,9 @@ type Config struct { func init() { plugin.Register(&plugin.Registration{ - Type: plugin.SnapshotPlugin, - ID: "zfs", + Type: plugin.SnapshotPlugin, + ID: "zfs", + Config: &Config{}, InitFn: func(ic *plugin.InitContext) (interface{}, error) { ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec()) diff --git a/vendor/modules.txt b/vendor/modules.txt index e3f8a709f..f06ba564a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -103,7 +103,7 @@ github.com/containerd/ttrpc/plugin # github.com/containerd/typeurl v1.0.2 ## explicit github.com/containerd/typeurl -# github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433 +# github.com/containerd/zfs v0.0.0-20210416085227-4140c9077d87 ## explicit github.com/containerd/zfs github.com/containerd/zfs/plugin From 6dd29c25f499446550d4fc48618a08c0501a986e Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 16 Apr 2021 15:09:31 -0700 Subject: [PATCH 2/2] go.mod: github.com/containerd/aufs Signed-off-by: Samuel Karp --- go.mod | 2 +- go.sum | 2 ++ vendor/github.com/containerd/aufs/plugin/plugin.go | 5 +++-- vendor/modules.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 50a4a8a8d..7af08c726 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/Microsoft/go-winio v0.4.17 github.com/Microsoft/hcsshim v0.8.16 - github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 + github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0 github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676 github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 github.com/containerd/console v1.0.2 diff --git a/go.sum b/go.sum index 91f674c5c..3a972f00b 100644 --- a/go.sum +++ b/go.sum @@ -96,6 +96,8 @@ github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABA github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 h1:eDnTE2gn5fNykNuQdUIhr5XHqLJR52FXCGxhWNHG4FM= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= +github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0 h1:naOo1n+31DqP+0v8OJsrZg32CCLHUlhY6dfnnZBlgtU= +github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676 h1:jNaRXAhCLuQ2x3k4nZNxaZN27/BCMhLfVkCEokYPI5Q= github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= diff --git a/vendor/github.com/containerd/aufs/plugin/plugin.go b/vendor/github.com/containerd/aufs/plugin/plugin.go index 79c9f2e77..5ef194a7e 100644 --- a/vendor/github.com/containerd/aufs/plugin/plugin.go +++ b/vendor/github.com/containerd/aufs/plugin/plugin.go @@ -31,8 +31,9 @@ type Config struct { func init() { plugin.Register(&plugin.Registration{ - Type: plugin.SnapshotPlugin, - ID: "aufs", + Type: plugin.SnapshotPlugin, + ID: "aufs", + Config: &Config{}, InitFn: func(ic *plugin.InitContext) (interface{}, error) { ic.Meta.Platforms = append(ic.Meta.Platforms, platforms.DefaultSpec()) diff --git a/vendor/modules.txt b/vendor/modules.txt index f06ba564a..ba4167262 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -51,7 +51,7 @@ github.com/cilium/ebpf/asm github.com/cilium/ebpf/internal github.com/cilium/ebpf/internal/btf github.com/cilium/ebpf/internal/unix -# github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97 +# github.com/containerd/aufs v0.0.0-20210416161429-fb0192dcb2c0 ## explicit github.com/containerd/aufs github.com/containerd/aufs/plugin