Skip to content

util: do not use mount-utils.IsLikelyNotMountPoint anymore #5203

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

Merged
mergify merged 2 commits into from
Mar 14, 2025
Merged

util: do not use mount-utils.IsLikelyNotMountPoint anymore #5203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e53bb96
util: do not use `mount-utils.IsLikelyNotMountPoint` anymore
nixpanic Mar 7, 2025
95b697c
rbd: cleanup NodeServer.createTargetMountPath()
nixpanic Mar 13, 2025
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
26 changes: 13 additions & 13 deletions e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ require (
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
github.com/onsi/ginkgo/v2 v2.23.0
github.com/onsi/gomega v1.36.2
// when updating k8s.io modules, update the 'replace' section below too
k8s.io/api v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/client-go v12.0.0+incompatible
Expand All @@ -24,6 +25,18 @@ require (
k8s.io/pod-security-admission v0.32.2
)

replace (
k8s.io/api => k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
k8s.io/client-go => k8s.io/client-go v0.32.2
k8s.io/cri-client => k8s.io/cri-client v0.32.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
k8s.io/kubectl => k8s.io/kubectl v0.32.2
k8s.io/kubelet => k8s.io/kubelet v0.32.2
)

require (
cel.dev/expr v0.19.1 // indirect
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
Expand Down Expand Up @@ -155,18 +168,5 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.32.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
k8s.io/client-go => k8s.io/client-go v0.32.2
k8s.io/cri-client => k8s.io/cri-client v0.32.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
k8s.io/kubectl => k8s.io/kubectl v0.32.2
k8s.io/kubelet => k8s.io/kubelet v0.32.2
k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
)

// version 3.9 is really old, don't use that!
exclude github.com/openshift/api v3.9.0+incompatible
4 changes: 2 additions & 2 deletions e2e/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ k8s.io/kubelet v0.32.2 h1:WFTSYdt3BB1aTApDuKNI16x/4MYqqX8WBBBBh3KupDg=
k8s.io/kubelet v0.32.2/go.mod h1:cC1ms5RS+lu0ckVr6AviCQXHLSPKEBC3D5oaCBdTGkI=
k8s.io/kubernetes v1.32.2 h1:mShetlA102UpjRVSGzB+5vjJwy8oPy8FMWrkTH5f37o=
k8s.io/kubernetes v1.32.2/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I=
k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0=
k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y=
k8s.io/mount-utils v0.32.2 h1:aDwp+ucWiVnDr/LpRg88/dsXf/vm6gI1VZkYH3+3+Vw=
k8s.io/mount-utils v0.32.2/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
k8s.io/pod-security-admission v0.32.2 h1:zDfAb/t0LbNU3z0ZMHtCb1zp8x05gWCGhmBYpUptm9A=
k8s.io/pod-security-admission v0.32.2/go.mod h1:yxMPB3i1pGMLfxbe4BiWMuowMD7cdHR32y4nCj4wH+s=
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
Expand Down
8 changes: 7 additions & 1 deletion e2e/vendor/k8s.io/mount-utils/mount_helper_unix.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

145 changes: 124 additions & 21 deletions e2e/vendor/k8s.io/mount-utils/mount_linux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions e2e/vendor/k8s.io/mount-utils/mount_windows.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions e2e/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1648,8 +1648,8 @@ k8s.io/kubernetes/test/utils/kubeconfig
k8s.io/kubernetes/third_party/forked/golang/expansion
k8s.io/kubernetes/third_party/forked/libcontainer/apparmor
k8s.io/kubernetes/third_party/forked/libcontainer/utils
# k8s.io/mount-utils v0.32.2 => k8s.io/mount-utils v0.29.3
## explicit; go 1.21
# k8s.io/mount-utils v0.32.2
## explicit; go 1.23.0
k8s.io/mount-utils
# k8s.io/pod-security-admission v0.32.2
## explicit; go 1.23.0
Expand Down Expand Up @@ -1708,4 +1708,3 @@ sigs.k8s.io/yaml/goyaml.v2
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
# k8s.io/kubectl => k8s.io/kubectl v0.32.2
# k8s.io/kubelet => k8s.io/kubelet v0.32.2
# k8s.io/mount-utils => k8s.io/mount-utils v0.29.3
7 changes: 2 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ require (
k8s.io/cloud-provider v0.32.2
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.32.2
k8s.io/mount-utils v0.32.2
k8s.io/utils v0.0.0-20241210054802-24370beab758
)

Expand All @@ -50,11 +51,6 @@ require (

replace k8s.io/client-go => k8s.io/client-go v0.32.2

// TODO: replaced by v0.29.3 until https://github.com/ceph/ceph-csi/issues/4633 is fixed
require k8s.io/mount-utils v0.32.2

replace k8s.io/mount-utils => k8s.io/mount-utils v0.29.3

exclude (
// missing tag, referred to by github.com/hashicorp/go-kms-wrapping@v0.5.1
github.com/hashicorp/vault/sdk v0.1.14-0.20191229212425-c478d00be0d6
Expand Down Expand Up @@ -126,6 +122,7 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand Down
Loading