Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert mount-utils back to utils/mount #2726

Merged
merged 1 commit into from
Nov 11, 2020
Merged

Revert mount-utils back to utils/mount #2726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fs/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
zfs "github.com/mistifyio/go-zfs"

"k8s.io/klog/v2"
mount "k8s.io/mount-utils"
"k8s.io/utils/mount"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion fs/fs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"k8s.io/mount-utils"
"k8s.io/utils/mount"
)

func TestGetDiskStatsMap(t *testing.T) {
Expand Down
15 changes: 3 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.13

require (
cloud.google.com/go v0.54.0
cloud.google.com/go/pubsub v1.3.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Microsoft/go-winio v0.4.15 // indirect
github.com/aws/aws-sdk-go v1.35.24
Expand All @@ -16,16 +15,13 @@ require (
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0
github.com/envoyproxy/go-control-plane v0.9.4 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible
github.com/gogo/protobuf v1.3.1
github.com/golang/mock v1.4.4 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/martian/v3 v3.1.0 // indirect
github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/karrick/godirwalk v1.16.1
github.com/kr/pretty v0.2.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
Expand All @@ -40,20 +36,15 @@ require (
github.com/prometheus/common v0.15.0
github.com/stretchr/testify v1.6.1
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
go.opencensus.io v0.22.5 // indirect
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/sys v0.0.0-20201110211018-35f3e6cf4a65
golang.org/x/text v0.3.4 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
golang.org/x/tools v0.0.0-20201030143252-cf7a54d06671 // indirect
google.golang.org/api v0.22.0 // indirect
google.golang.org/appengine v1.6.6 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/grpc v1.27.1
google.golang.org/protobuf v1.25.0 // indirect
gotest.tools v2.2.0+incompatible // indirect
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
k8s.io/klog/v2 v2.2.0
k8s.io/mount-utils v0.20.0-alpha.3
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)
Loading