From 208e5e1a3c0b04af622d877b38a27af80944a59a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 15 Jan 2025 13:08:52 +0100 Subject: [PATCH] vendor: github.com/containerd/fuse-overlayfs-snapshotter v2.1.1 - Downgrade go-difflib and go-spew to tagged releases - Remove references to io/ioutil package - Bump github.com/containerd/containerd/v2 from 2.0.0 to 2.0.2 - Bump golang.org/x/net from 0.30.0 to 0.33.0 - Bump google.golang.org/grpc from 1.68.1 to 1.69.4 full diff: https://github.com/containerd/fuse-overlayfs-snapshotter/compare/v2.1.0...v2.1.1 Signed-off-by: Sebastiaan van Stijn --- go.mod | 2 +- go.sum | 4 +-- .../v2/.golangci.yml | 25 +++++++++++++++++++ .../fuse-overlayfs-snapshotter/v2/check.go | 3 +-- .../v2/fuseoverlayfs.go | 3 +-- vendor/modules.txt | 2 +- 6 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/.golangci.yml diff --git a/go.mod b/go.mod index d367991a80d0..706eb302e9d3 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/containerd/containerd/v2 v2.0.2 github.com/containerd/continuity v0.4.5 github.com/containerd/errdefs v1.0.0 - github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.0 + github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.1 github.com/containerd/go-cni v1.1.11 github.com/containerd/go-runc v1.1.0 github.com/containerd/log v0.1.0 diff --git a/go.sum b/go.sum index 9c304f86cee4..bf80ed0f894c 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,8 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o= -github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.0 h1:okk7wQXjHJhG+Y+Rs3wToje/yHJInlE3DjLNQNJ1WGI= -github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.0/go.mod h1:yK/eAdWigKE4XsBi8WDHV52jO8MJZcTRU5tCVOnEE9w= +github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.1 h1:3N/qo9fkWavYRLeUWsKWOulrLYLMLKcut6EQJoJ2q/A= +github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.1/go.mod h1:WFiRbg7aIgJozIvNe3r9aHszi6AQQigOPgnbkk9xMmo= github.com/containerd/go-cni v1.1.11 h1:fWt1K15AmSLsEfa57N+qYw4NeGPiQKYq1pjNGJwV9mc= github.com/containerd/go-cni v1.1.11/go.mod h1:/Y/sL8yqYQn1ZG1om1OncJB1W4zN3YmjfP/ShCzG/OY= github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA= diff --git a/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/.golangci.yml b/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/.golangci.yml new file mode 100644 index 000000000000..f29690390085 --- /dev/null +++ b/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/.golangci.yml @@ -0,0 +1,25 @@ +linters: + enable: + - copyloopvar + - depguard + - gofmt + - gosec + - govet + - ineffassign + - misspell + - nolintlint + - staticcheck + - tenv + - unconvert + - unused + disable: + - errcheck + - revive + +linters-settings: + depguard: + rules: + main: + deny: + - pkg: "io/ioutil" + desc: use "io" or "os" instead diff --git a/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/check.go b/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/check.go index f32da56d2ebd..7841f0cb1e88 100644 --- a/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/check.go +++ b/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/check.go @@ -21,7 +21,6 @@ package fuseoverlayfs import ( "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -33,7 +32,7 @@ import ( // supportsReadonlyMultipleLowerDir checks if read-only multiple lowerdirs can be mounted with fuse-overlayfs. // https://github.com/containers/fuse-overlayfs/pull/133 func supportsReadonlyMultipleLowerDir(d string) error { - td, err := ioutil.TempDir(d, "fuseoverlayfs-check") + td, err := os.MkdirTemp(d, "fuseoverlayfs-check") if err != nil { return err } diff --git a/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/fuseoverlayfs.go b/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/fuseoverlayfs.go index 9ea56427a613..303bea674ee8 100644 --- a/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/fuseoverlayfs.go +++ b/vendor/github.com/containerd/fuse-overlayfs-snapshotter/v2/fuseoverlayfs.go @@ -22,7 +22,6 @@ package fuseoverlayfs import ( "context" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -417,7 +416,7 @@ func (o *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k } func (o *snapshotter) prepareDirectory(ctx context.Context, snapshotDir string, kind snapshots.Kind) (string, error) { - td, err := ioutil.TempDir(snapshotDir, "new-") + td, err := os.MkdirTemp(snapshotDir, "new-") if err != nil { return "", fmt.Errorf("failed to create temp dir: %w", err) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 1b8ebc8621f9..eb9c5c8543ea 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -391,7 +391,7 @@ github.com/containerd/errdefs/pkg/internal/types # github.com/containerd/fifo v1.1.0 ## explicit; go 1.18 github.com/containerd/fifo -# github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.0 +# github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.1 ## explicit; go 1.22.0 github.com/containerd/fuse-overlayfs-snapshotter/v2 # github.com/containerd/go-cni v1.1.11