github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 00:07:50 +00:00
Code Issues Projects Releases Wiki Activity

move deprecation comment to TearDownAt function

Browse Source
This commit is contained in:
Jonathan Dobson 2021-04-27 11:40:12 -06:00
parent e92dc8d9be
commit 75a7966414
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/volume/csi/csi_mounter.go
View File

@ -365,7 +365,9 @@ func (c *csiMountMgr) TearDownAt(dir string) error {
return errors.New(log("mounter.TearDownAt failed: %v", err)) return errors.New(log("mounter.TearDownAt failed: %v", err))
} }
// clean mount point dir // Deprecation: Removal of this mount directory MUST be done by
// the CSI plugin according to the spec. This will no longer be done
// directly as part of TearDown by the kubelet in the future.
if err := removeMountDir(c.plugin, dir); err != nil { if err := removeMountDir(c.plugin, dir); err != nil {
return errors.New(log("mounter.TearDownAt failed to clean mount dir [%s]: %v", dir, err)) return errors.New(log("mounter.TearDownAt failed to clean mount dir [%s]: %v", dir, err))
} }
@ -426,9 +428,6 @@ func removeMountDir(plug *csiPlugin, mountPath string) error {
} }
if !mnt { if !mnt {
klog.V(4).Info(log("dir not mounted, deleting it [%s]", mountPath)) klog.V(4).Info(log("dir not mounted, deleting it [%s]", mountPath))
// Deprecation: Removal of this mountPath directory MUST be done by
// the CSI plugin according to the spec. This will no longer be done
// directly as part of TearDown by the kubelet in the future.
if err := os.Remove(mountPath); err != nil && !os.IsNotExist(err) { if err := os.Remove(mountPath); err != nil && !os.IsNotExist(err) {
return errors.New(log("failed to remove dir [%s]: %v", mountPath, err)) return errors.New(log("failed to remove dir [%s]: %v", mountPath, err))
} }