From c8a0a173f03cffa33751523132c4e7def2a10a61 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Thu, 1 Dec 2022 03:38:55 +0000 Subject: [PATCH] Update estargz-snapshotter to -k3s1 Signed-off-by: Brad Davidson --- go.mod | 5 +++++ go.sum | 11 ++++++----- .../stargz-snapshotter/service/keychain/cri/cri.go | 2 +- .../stargz-snapshotter/service/plugin/plugin.go | 2 +- .../stargz-snapshotter/service/resolver/cri.go | 2 +- vendor/modules.txt | 6 ++++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 0952622dbcc8..e9d2d7d34552 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,11 @@ module github.com/containerd/containerd go 1.17 +replace ( + github.com/containerd/stargz-snapshotter => github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1 + github.com/containerd/stargz-snapshotter/estargz => github.com/k3s-io/stargz-snapshotter/estargz v0.13.0-k3s1 +) + require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 github.com/Microsoft/go-winio v0.5.2 diff --git a/go.sum b/go.sum index c34167407d8f..2ded152c674e 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,7 @@ github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwT github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim v0.9.4/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= +github.com/Microsoft/hcsshim v0.9.5/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim v0.9.7 h1:mKNHW/Xvv1aFH87Jb6ERDzXTJTLPlmzfZ28VBFD/bfg= github.com/Microsoft/hcsshim v0.9.7/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= @@ -227,6 +228,7 @@ github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0 github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= github.com/containerd/containerd v1.6.9/go.mod h1:XVicUvkxOrftE2Q1YWUXgZwkkAxwQYNOFzYWvfVfEfQ= +github.com/containerd/containerd v1.6.10/go.mod h1:CVqfxdJ95PDgORwA219AwwLrREZgrTFybXu2HfMKRG0= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -269,11 +271,6 @@ github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFY github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= github.com/containerd/nri v0.1.0 h1:6QioHRlThlKh2RkRTR4kIT3PKAcrLo3gIWnjkM4dQmQ= github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/stargz-snapshotter v0.13.0 h1:3zr1/IkW1aEo6cMYTQeZ4L2jSuCN+F4kgGfjnuowe4U= -github.com/containerd/stargz-snapshotter v0.13.0/go.mod h1:01uOvoNzN1T4kV+8HeVt9p29esO5/61x8+VP/KU4fvQ= -github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= -github.com/containerd/stargz-snapshotter/estargz v0.13.0 h1:fD7AwuVV+B40p0d9qVkH/Au1qhp8hn/HWJHIYjpEcfw= -github.com/containerd/stargz-snapshotter/estargz v0.13.0/go.mod h1:m+9VaGJGlhCnrcEUod8mYumTmRgblwd3rC5UCEh2Yp0= github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= @@ -650,6 +647,10 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1 h1:Kxs7Y1kayAX3hr3X+rkSBCaDwaWR/OfbWy+oESiBnN0= +github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1/go.mod h1:k+OjA93AK1owz6DgNIpxuiepp/SGrSZ0HX6lWjA3CVI= +github.com/k3s-io/stargz-snapshotter/estargz v0.13.0-k3s1 h1:7yr9Tg1MsUV1+vQD9S0MIN6gnPl1hBgHa2XR+R5L+KM= +github.com/k3s-io/stargz-snapshotter/estargz v0.13.0-k3s1/go.mod h1:m+9VaGJGlhCnrcEUod8mYumTmRgblwd3rC5UCEh2Yp0= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/vendor/github.com/containerd/stargz-snapshotter/service/keychain/cri/cri.go b/vendor/github.com/containerd/stargz-snapshotter/service/keychain/cri/cri.go index cd53597e7eb3..8903b93a3880 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/service/keychain/cri/cri.go +++ b/vendor/github.com/containerd/stargz-snapshotter/service/keychain/cri/cri.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/reference" distribution "github.com/containerd/containerd/reference/docker" "github.com/containerd/stargz-snapshotter/service/resolver" - runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) // NewCRIKeychain provides creds passed through CRI PullImage API. diff --git a/vendor/github.com/containerd/stargz-snapshotter/service/plugin/plugin.go b/vendor/github.com/containerd/stargz-snapshotter/service/plugin/plugin.go index 69d469c49f9f..5e6fb0d1a7d4 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/service/plugin/plugin.go +++ b/vendor/github.com/containerd/stargz-snapshotter/service/plugin/plugin.go @@ -37,7 +37,7 @@ import ( grpc "google.golang.org/grpc" "google.golang.org/grpc/backoff" "google.golang.org/grpc/credentials/insecure" - runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) // Config represents configuration for the stargz snapshotter plugin. diff --git a/vendor/github.com/containerd/stargz-snapshotter/service/resolver/cri.go b/vendor/github.com/containerd/stargz-snapshotter/service/resolver/cri.go index 7aa37ef67ff0..3f88354247de 100644 --- a/vendor/github.com/containerd/stargz-snapshotter/service/resolver/cri.go +++ b/vendor/github.com/containerd/stargz-snapshotter/service/resolver/cri.go @@ -42,7 +42,7 @@ import ( dconfig "github.com/containerd/containerd/remotes/docker/config" "github.com/containerd/stargz-snapshotter/fs/source" rhttp "github.com/hashicorp/go-retryablehttp" - runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" + runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) // Registry is registry settings configured diff --git a/vendor/modules.txt b/vendor/modules.txt index da35d00d8215..c06a91bc73e3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -122,7 +122,7 @@ github.com/containerd/imgcrypt/images/encryption ## explicit; go 1.14 github.com/containerd/nri github.com/containerd/nri/types/v1 -# github.com/containerd/stargz-snapshotter v0.13.0 +# github.com/containerd/stargz-snapshotter v0.13.0 => github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1 ## explicit; go 1.16 github.com/containerd/stargz-snapshotter/cache github.com/containerd/stargz-snapshotter/fs @@ -150,7 +150,7 @@ github.com/containerd/stargz-snapshotter/util/containerdutil github.com/containerd/stargz-snapshotter/util/ioutils github.com/containerd/stargz-snapshotter/util/namedmutex github.com/containerd/stargz-snapshotter/util/testutil -# github.com/containerd/stargz-snapshotter/estargz v0.13.0 +# github.com/containerd/stargz-snapshotter/estargz v0.13.0 => github.com/k3s-io/stargz-snapshotter/estargz v0.13.0-k3s1 ## explicit; go 1.16 github.com/containerd/stargz-snapshotter/estargz github.com/containerd/stargz-snapshotter/estargz/errorutil @@ -1034,6 +1034,8 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml +# github.com/containerd/stargz-snapshotter => github.com/k3s-io/stargz-snapshotter v0.13.0-k3s1 +# github.com/containerd/stargz-snapshotter/estargz => github.com/k3s-io/stargz-snapshotter/estargz v0.13.0-k3s1 # github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2 # github.com/urfave/cli => github.com/urfave/cli v1.22.1 # golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd