github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87713 from kkmsft/filepath-fixes-windows

Browse Source 
Move 'path' package usage to 'path/filepath'.
This commit is contained in:
Kubernetes Prow Robot 2020-02-03 17:07:25 -08:00 committed by GitHub
commit 76c89645c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"os" "os"
"path"
"path/filepath" "path/filepath"
"strconv" "strconv"
@ -432,7 +431,7 @@ func removeMountDir(plug *csiPlugin, mountPath string) error {
return errors.New(log("failed to remove dir [%s]: %v", mountPath, err)) return errors.New(log("failed to remove dir [%s]: %v", mountPath, err))
} }
// remove volume data file as well // remove volume data file as well
volPath := path.Dir(mountPath) volPath := filepath.Dir(mountPath)
dataFile := filepath.Join(volPath, volDataFileName) dataFile := filepath.Join(volPath, volDataFileName)
klog.V(4).Info(log("also deleting volume info data file [%s]", dataFile)) klog.V(4).Info(log("also deleting volume info data file [%s]", dataFile))
if err := os.Remove(dataFile); err != nil && !os.IsNotExist(err) { if err := os.Remove(dataFile); err != nil && !os.IsNotExist(err) {

6
pkg/volume/csi/csi_plugin.go
View File

@ -20,7 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"os" "os"
"path" "path/filepath"
"strings" "strings"
"time" "time"
@ -387,7 +387,7 @@ func (p *csiPlugin) NewMounter(
// Save volume info in pod dir // Save volume info in pod dir
dir := mounter.GetPath() dir := mounter.GetPath()
dataDir := path.Dir(dir) // dropoff /mount at end dataDir := filepath.Dir(dir) // dropoff /mount at end
if err := os.MkdirAll(dataDir, 0750); err != nil { if err := os.MkdirAll(dataDir, 0750); err != nil {
return nil, errors.New(log("failed to create dir %#v: %v", dataDir, err)) return nil, errors.New(log("failed to create dir %#v: %v", dataDir, err))
@ -438,7 +438,7 @@ func (p *csiPlugin) NewUnmounter(specName string, podUID types.UID) (volume.Unmo
// load volume info from file // load volume info from file
dir := unmounter.GetPath() dir := unmounter.GetPath()
dataDir := path.Dir(dir) // dropoff /mount at end dataDir := filepath.Dir(dir) // dropoff /mount at end
data, err := loadVolumeData(dataDir, volDataFileName) data, err := loadVolumeData(dataDir, volDataFileName)
if err != nil { if err != nil {
return nil, errors.New(log("unmounter failed to load volume data file [%s]: %v", dir, err)) return nil, errors.New(log("unmounter failed to load volume data file [%s]: %v", dir, err))