kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use path instead of filepath for cross platform

pull/2052/head
Matt Rickard 2017-10-11 14:26:42 -07:00
parent 320b5cdb77
commit 1a38ef74b2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/minikube/assets/vm_assets.go
View File

@ -20,7 +20,7 @@ import (
"bytes" "bytes"
"io" "io"
"os" "os"
"path/filepath" "path"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -65,7 +65,7 @@ type FileAsset struct {
} }
func NewMemoryAssetTarget(d []byte, targetPath, permissions string) *MemoryAsset { func NewMemoryAssetTarget(d []byte, targetPath, permissions string) *MemoryAsset {
return NewMemoryAsset(d, filepath.Dir(targetPath), filepath.Base(targetPath), permissions) return NewMemoryAsset(d, path.Dir(targetPath), path.Base(targetPath), permissions)
} }
func NewFileAsset(assetName, targetDir, targetName, permissions string) (*FileAsset, error) { func NewFileAsset(assetName, targetDir, targetName, permissions string) (*FileAsset, error) {

4
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
View File

@ -21,7 +21,7 @@ import (
"crypto" "crypto"
"fmt" "fmt"
"os" "os"
"path/filepath" "path"
"strings" "strings"
"time" "time"
@ -361,7 +361,7 @@ func generateConfig(k8s bootstrapper.KubernetesConfig) (string, error) {
func maybeDownloadAndCache(binary, version string) (string, error) { func maybeDownloadAndCache(binary, version string) (string, error) {
targetDir := constants.MakeMiniPath("cache", version) targetDir := constants.MakeMiniPath("cache", version)
targetFilepath := filepath.Join(targetDir, binary) targetFilepath := path.Join(targetDir, binary)
_, err := os.Stat(targetFilepath) _, err := os.Stat(targetFilepath)
// If it exists, do no verification and continue // If it exists, do no verification and continue