Merge pull request #4139 from marcosdiez/proper_permissions

BugFix: ExecRunner.Copy now parses permissions strings as octal
kubernetes · Apr 25, 2019 · b2f0cd8 · b2f0cd8
2 parents b497fad + 10d75b8
commit b2f0cd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/minikube/bootstrapper/exec_runner.go b/pkg/minikube/bootstrapper/exec_runner.go
@@ -87,7 +87,7 @@ func (*ExecRunner) Copy(f assets.CopyableFile) error {
 	if err != nil {
 		return errors.Wrapf(err, "error creating file at %s", targetPath)
 	}
-	perms, err := strconv.Atoi(f.GetPermissions())
+	perms, err := strconv.ParseInt(f.GetPermissions(), 8, 0)
 	if err != nil {
 		return errors.Wrapf(err, "error converting permissions %s to integer", f.GetPermissions())
 	}

diff --git a/pkg/minikube/machine/cache_binaries.go b/pkg/minikube/machine/cache_binaries.go
@@ -85,7 +85,7 @@ func CacheBinary(binary, version string) (string, error) {
 
 // CopyBinary copies previously cached binaries into the path
 func CopyBinary(cr bootstrapper.CommandRunner, binary, path string) error {
-	f, err := assets.NewFileAsset(path, "/usr/bin", binary, "0641")
+	f, err := assets.NewFileAsset(path, "/usr/bin", binary, "0755")
 	if err != nil {
 		return errors.Wrap(err, "new file asset")
 	}