Merge pull request #743 from andyzhangx/mount-utils-enodev

fix: bump mount-utils to treat ENODEV error as corrupted mount
This commit is contained in:
Andy Zhang 2024-08-18 14:20:30 +08:00 committed by GitHub
commit 8036bff2b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 5 deletions

2
go.mod
View File

@ -17,7 +17,7 @@ require (
k8s.io/client-go v0.28.12
k8s.io/klog/v2 v2.130.1
k8s.io/kubernetes v1.28.12
k8s.io/mount-utils v0.29.7
k8s.io/mount-utils v0.29.8
k8s.io/pod-security-admission v0.0.0
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/cloud-provider-azure v1.28.9

4
go.sum
View File

@ -672,8 +672,8 @@ k8s.io/kubelet v0.28.9 h1:76v00fFLeniz27kXhGGUIxONdwa9LKcD2Jd5cXYAZko=
k8s.io/kubelet v0.28.9/go.mod h1:46P39DFjI+E59nU2OgpatyS3oWy58ClulKO6riZ/97o=
k8s.io/kubernetes v1.28.12 h1:DtWB8ZjoYiN/PXD4qDXFppf9IouVUavn6r3S+3NMUkU=
k8s.io/kubernetes v1.28.12/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk=
k8s.io/mount-utils v0.29.7 h1:M0LA8Tx8HtpwBy24fajiUsaklIiNi1tNrHpROxX4bLI=
k8s.io/mount-utils v0.29.7/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
k8s.io/mount-utils v0.29.8 h1:Bf1H+43DXRuusBEhHrxZkdt8ULbm2Rq70nDRy9+GQV0=
k8s.io/mount-utils v0.29.8/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0=
k8s.io/pod-security-admission v0.28.9 h1:towoNqSp7aU7gF8T89zftCuQUfliyib3ds20Kz/hysg=
k8s.io/pod-security-admission v0.28.9/go.mod h1:mfEhECQ+AvP+zehqxemSq1pDL4YLoWCP7liL0YmkpZY=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=

View File

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

2
vendor/modules.txt vendored
View File

@ -1260,7 +1260,7 @@ k8s.io/kubernetes/test/utils
k8s.io/kubernetes/test/utils/format
k8s.io/kubernetes/test/utils/image
k8s.io/kubernetes/test/utils/kubeconfig
# k8s.io/mount-utils v0.29.7
# k8s.io/mount-utils v0.29.8
## explicit; go 1.21
k8s.io/mount-utils
# k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.28.9