Merge branch 'hyperkit-mount-fix' of github.com:mo-hit/minikube into mo-hit-hyperkit-mount-fix

Author: dlorenc

Godeps/Godeps.json

@@ -52,6 +52,8 @@ const (
 	humanReadableDiskSize = "disk-size"
 	vmDriver              = "vm-driver"
 	xhyveDiskDriver       = "xhyve-disk-driver"
+	NFSSharesRoot         = "nfs-shares-root"
+	NFSShare              = "nfs-share"
 	kubernetesVersion     = "kubernetes-version"
 	hostOnlyCIDR          = "host-only-cidr"
 	containerRuntime      = "container-runtime"
@@ -130,6 +132,8 @@ func runStart(cmd *cobra.Command, args []string) {
 		DiskSize:            diskSizeMB,
 		VMDriver:            viper.GetString(vmDriver),
 		XhyveDiskDriver:     viper.GetString(xhyveDiskDriver),
+		NFSShare:            viper.GetStringSlice(NFSShare),
+		NFSSharesRoot:       viper.GetString(NFSSharesRoot),
 		DockerEnv:           dockerEnv,
 		DockerOpt:           dockerOpt,
 		InsecureRegistry:    insecureRegistry,
@@ -367,6 +371,8 @@ func init() {
 	startCmd.Flags().String(hypervVirtualSwitch, "", "The hyperv virtual switch name. Defaults to first found. (only supported with HyperV driver)")
 	startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (only supported with KVM driver)")
 	startCmd.Flags().String(xhyveDiskDriver, "ahci-hd", "The disk driver to use [ahci-hd|virtio-blk] (only supported with xhyve driver)")
+	startCmd.Flags().StringSlice(NFSShare, []string{}, "Local folders to share with Guest via NFS mounts")
+	startCmd.Flags().String(NFSSharesRoot, "/nfsshares", "Where to root the NFS Shares (defaults to /nfsshares)")
 	startCmd.Flags().StringArrayVar(&dockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)")
 	startCmd.Flags().StringArrayVar(&dockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)")
 	startCmd.Flags().String(apiServerName, constants.APIServerName, "The apiserver name which is used in the generated certificate for localkube/kubernetes.  This can be used if you want to make the apiserver available from outside the machine")

cmd/minikube/cmd/start.go

@@ -22,13 +22,17 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"os/user"
+	"path"
 	"path/filepath"
+	"strings"
 	"syscall"
 	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/state"
+	nfsexports "github.com/johanneswuerbach/nfsexports"
 	hyperkit "github.com/moby/hyperkit/go"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
@@ -53,6 +57,8 @@ type Driver struct {
 	CPU            int
 	Memory         int
 	Cmdline        string
+	NFSShares      []string
+	NFSSharesRoot  string
 }
 
 func NewDriver(hostName, storePath string) *Driver {
@@ -207,6 +213,18 @@ func (d *Driver) Start() error {
 	if err := commonutil.RetryAfter(30, getIP, 2*time.Second); err != nil {
 		return fmt.Errorf("IP address never found in dhcp leases file %v", err)
 	}
+
+	if len(d.NFSShares) > 0 {
+		log.Info("Setting up NFS mounts")
+		// takes some time here for ssh / nfsd to work properly
+		time.Sleep(time.Second * 30)
+		err = d.setupNFSShare()
+		if err != nil {
+			log.Errorf("NFS setup failed: %s", err.Error())
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -232,6 +250,56 @@ func (d *Driver) extractKernel(isoPath string) error {
 	return nil
 }
 
+func (d *Driver) setupNFSShare() error {
+	user, err := user.Current()
+	if err != nil {
+		return err
+	}
+
+	hostIP, err := GetNetAddr()
+	if err != nil {
+		return err
+	}
+
+	mountCommands := fmt.Sprintf("#/bin/bash\\n")
+	log.Info(d.IPAddress)
+
+	for _, share := range d.NFSShares {
+		if !path.IsAbs(share) {
+			share = d.ResolveStorePath(share)
+		}
+		nfsConfig := fmt.Sprintf("%s %s -alldirs -mapall=%s", share, d.IPAddress, user.Username)
+
+		if _, err := nfsexports.Add("", d.nfsExportIdentifier(share), nfsConfig); err != nil {
+			if strings.Contains(err.Error(), "conflicts with existing export") {
+				log.Info("Conflicting NFS Share not setup and ignored:", err)
+				continue
+			}
+			return err
+		}
+
+		root := d.NFSSharesRoot
+		mountCommands += fmt.Sprintf("sudo mkdir -p %s/%s\\n", root, share)
+		mountCommands += fmt.Sprintf("sudo mount -t nfs -o noacl,async %s:%s %s/%s\\n", hostIP, share, root, share)
+	}
+
+	if err := nfsexports.ReloadDaemon(); err != nil {
+		return err
+	}
+
+	writeScriptCmd := fmt.Sprintf("echo -e \"%s\" | sh", mountCommands)
+
+	if _, err := drivers.RunSSHCommandFromDriver(d, writeScriptCmd); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (d *Driver) nfsExportIdentifier(path string) string {
+	return fmt.Sprintf("docker-machine-driver-hyperkit %s-%s", d.MachineName, path)
+}
+
 func (d *Driver) sendSignal(s os.Signal) error {
 	pid := d.getPid()
 	proc, err := os.FindProcess(pid)

pkg/drivers/hyperkit/driver.go

@@ -18,8 +18,38 @@ limitations under the License.
 
 package hyperkit
 
-import vmnet "github.com/zchee/go-vmnet"
+import (
+	"fmt"
+	"net"
+	"os"
+	"os/exec"
+	"strings"
+
+	vmnet "github.com/zchee/go-vmnet"
+)
+
+const (
+	CONFIG_PLIST = "/Library/Preferences/SystemConfiguration/com.apple.vmnet"
+	NET_ADDR_KEY = "Shared_Net_Address"
+)
 
 func GetMACAddressFromUUID(UUID string) (string, error) {
 	return vmnet.GetMACAddressFromUUID(UUID)
 }
+
+func GetNetAddr() (net.IP, error) {
+	_, err := os.Stat(CONFIG_PLIST + ".plist")
+	if err != nil {
+		return nil, fmt.Errorf("Does not exist %s", CONFIG_PLIST+".plist")
+	}
+
+	out, err := exec.Command("defaults", "read", CONFIG_PLIST, NET_ADDR_KEY).Output()
+	if err != nil {
+		return nil, err
+	}
+	ip := net.ParseIP(strings.TrimSpace(string(out)))
+	if ip == nil {
+		return nil, fmt.Errorf("Could not get the network address for vmnet")
+	}
+	return ip, nil
+}

pkg/drivers/hyperkit/vmnet.go

@@ -69,6 +69,8 @@ func createHyperkitHost(config MachineConfig) *hyperkit.Driver {
 		DiskSize:       config.DiskSize,
 		Memory:         config.Memory,
 		CPU:            config.CPUs,
+		NFSShares:      config.NFSShare,
+		NFSSharesRoot:  config.NFSSharesRoot,
 		Cmdline:        "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=" + cfg.GetMachineName(),
 	}
 }

pkg/minikube/cluster/cluster_darwin.go

@@ -38,6 +38,8 @@ type MachineConfig struct {
 	Downloader          util.ISODownloader `json:"-"`
 	DockerOpt           []string           // Each entry is formatted as KEY=VALUE.
 	DisableDriverMounts bool               // Only used by virtualbox and xhyve
+	NFSShare            []string
+	NFSSharesRoot       string
 }
 
 // Config contains machine and k8s config