mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: update k8s.io packages to v0.29.0

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
2023-12-20 13:23:59 +01:00
committed by mergify[bot]
parent 328a264202
commit f080b9e0c9
367 changed files with 21340 additions and 11878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/k8s.io/mount-utils/mount_helper_common.go generated vendored
View File

@ -139,7 +139,7 @@ func removePathIfNotMountPoint(mountPath string, mounter Interface, extensiveMou
}
if notMnt {
klog.Warningf("Warning: %q is not a mountpoint, deleting", mountPath)
klog.V(4).Infof("%q is not a mountpoint, deleting", mountPath)
return notMnt, os.Remove(mountPath)
}
return notMnt, nil
@ -147,7 +147,7 @@ func removePathIfNotMountPoint(mountPath string, mounter Interface, extensiveMou
// removePath attempts to remove the directory. Returns nil if the directory was removed or does not exist.
func removePath(mountPath string) error {
klog.V(4).Infof("Warning: deleting path %q", mountPath)
klog.V(4).Infof("Deleting path %q", mountPath)
err := os.Remove(mountPath)
if os.IsNotExist(err) {
klog.V(4).Infof("%q does not exist", mountPath)

2
vendor/k8s.io/mount-utils/mount_helper_unix.go generated vendored
View File

@ -61,7 +61,7 @@ func IsCorruptedMnt(err error) bool {
underlyingError = err
}
return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN
return underlyingError == syscall.ENOTCONN || underlyingError == syscall.ESTALE || underlyingError == syscall.EIO || underlyingError == syscall.EACCES || underlyingError == syscall.EHOSTDOWN || underlyingError == syscall.EWOULDBLOCK
}
// MountInfo represents a single line in /proc/<pid>/mountinfo.

11
vendor/k8s.io/mount-utils/mount_windows.go generated vendored
View File

@ -150,12 +150,12 @@ func (mounter *Mounter) MountSensitive(source string, target string, fstype stri
mklinkSource = mklinkSource + "\\"
}
output, err := exec.Command("cmd", "/c", "mklink", "/D", target, mklinkSource).CombinedOutput()
err := os.Symlink(mklinkSource, target)
if err != nil {
klog.Errorf("mklink failed: %v, source(%q) target(%q) output: %q", err, mklinkSource, target, string(output))
klog.Errorf("symlink failed: %v, source(%q) target(%q)", err, mklinkSource, target)
return err
}
klog.V(2).Infof("mklink source(%q) on target(%q) successfully, output: %q", mklinkSource, target, string(output))
klog.V(2).Infof("symlink source(%q) on target(%q) successfully", mklinkSource, target)
return nil
}
@ -219,8 +219,9 @@ func removeSMBMapping(remotepath string) (string, error) {
func (mounter *Mounter) Unmount(target string) error {
klog.V(4).Infof("Unmount target (%q)", target)
target = NormalizeWindowsPath(target)
if output, err := exec.Command("cmd", "/c", "rmdir", target).CombinedOutput(); err != nil {
klog.Errorf("rmdir failed: %v, output: %q", err, string(output))
if err := os.Remove(target); err != nil {
klog.Errorf("removing directory %s failed: %v", target, err)
return err
}
return nil