remove the hyperkit prefix so we can move this to other drivers as well with time and fix vendoring issue

Author: Mohit Gupta

cmd/minikube/cmd/start.go

@@ -52,8 +52,8 @@ const (
 	humanReadableDiskSize = "disk-size"
 	vmDriver              = "vm-driver"
 	xhyveDiskDriver       = "xhyve-disk-driver"
-	hyperkitNFSSharesRoot = "hyperkit-nfs-shares-root"
-	hyperkitNFSShare      = "hyperkit-nfs-share"
+	NFSSharesRoot         = "nfs-shares-root"
+	NFSShare              = "nfs-share"
 	kubernetesVersion     = "kubernetes-version"
 	hostOnlyCIDR          = "host-only-cidr"
 	containerRuntime      = "container-runtime"
@@ -126,23 +126,23 @@ func runStart(cmd *cobra.Command, args []string) {
 	}
 
 	config := cluster.MachineConfig{
-		MinikubeISO:           viper.GetString(isoURL),
-		Memory:                viper.GetInt(memory),
-		CPUs:                  viper.GetInt(cpus),
-		DiskSize:              diskSizeMB,
-		VMDriver:              viper.GetString(vmDriver),
-		XhyveDiskDriver:       viper.GetString(xhyveDiskDriver),
-		HyperkitNFSShare:      viper.GetStringSlice(hyperkitNFSShare),
-		HyperkitNFSSharesRoot: viper.GetString(hyperkitNFSSharesRoot),
-		DockerEnv:             dockerEnv,
-		DockerOpt:             dockerOpt,
-		InsecureRegistry:      insecureRegistry,
-		RegistryMirror:        registryMirror,
-		HostOnlyCIDR:          viper.GetString(hostOnlyCIDR),
-		HypervVirtualSwitch:   viper.GetString(hypervVirtualSwitch),
-		KvmNetwork:            viper.GetString(kvmNetwork),
-		Downloader:            pkgutil.DefaultDownloader{},
-		DisableDriverMounts:   viper.GetBool(disableDriverMounts),
+		MinikubeISO:         viper.GetString(isoURL),
+		Memory:              viper.GetInt(memory),
+		CPUs:                viper.GetInt(cpus),
+		DiskSize:            diskSizeMB,
+		VMDriver:            viper.GetString(vmDriver),
+		XhyveDiskDriver:     viper.GetString(xhyveDiskDriver),
+		NFSShare:            viper.GetStringSlice(NFSShare),
+		NFSSharesRoot:       viper.GetString(NFSSharesRoot),
+		DockerEnv:           dockerEnv,
+		DockerOpt:           dockerOpt,
+		InsecureRegistry:    insecureRegistry,
+		RegistryMirror:      registryMirror,
+		HostOnlyCIDR:        viper.GetString(hostOnlyCIDR),
+		HypervVirtualSwitch: viper.GetString(hypervVirtualSwitch),
+		KvmNetwork:          viper.GetString(kvmNetwork),
+		Downloader:          pkgutil.DefaultDownloader{},
+		DisableDriverMounts: viper.GetBool(disableDriverMounts),
 	}
 
 	fmt.Printf("Starting local Kubernetes %s cluster...\n", viper.GetString(kubernetesVersion))
@@ -371,8 +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(hyperkitNFSShare, []string{}, "Local folders to share with Guest via NFS mounts")
-	startCmd.Flags().String(hyperkitNFSSharesRoot, "/hyperkit-nfsshares", "Where to root the NFS Shares")
+	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")

pkg/drivers/hyperkit/driver.go

@@ -262,14 +262,15 @@ func (d *Driver) setupNFSShare() error {
 	}
 
 	mountCommands := fmt.Sprintf("#/bin/bash\\n")
+	log.Info(d.IPAddress)
 
 	for _, share := range d.NFSShares {
-		if !path.IsAbs(share[:]) {
-			share = d.ResolveStorePath(share[:])
+		if !path.IsAbs(share) {
+			share = d.ResolveStorePath(share)
 		}
-		nfsConfig := fmt.Sprintf("%s %s -alldirs -mapall=%s", share[:], d.IPAddress, user.Username)
+		nfsConfig := fmt.Sprintf("%s %s -alldirs -mapall=%s", share, d.IPAddress, user.Username)
 
-		if _, err := nfsexports.Add("", d.nfsExportIdentifier(share[:]), nfsConfig); err != nil {
+		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

pkg/minikube/cluster/cluster_darwin.go

@@ -69,8 +69,8 @@ func createHyperkitHost(config MachineConfig) *hyperkit.Driver {
 		DiskSize:       config.DiskSize,
 		Memory:         config.Memory,
 		CPU:            config.CPUs,
-		NFSShares:      config.HyperkitNFSShare,
-		NFSSharesRoot:  config.HyperkitNFSSharesRoot,
+		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/types.go

@@ -23,23 +23,23 @@ import (
 
 // MachineConfig contains the parameters used to start a cluster.
 type MachineConfig struct {
-	MinikubeISO           string
-	Memory                int
-	CPUs                  int
-	DiskSize              int
-	VMDriver              string
-	XhyveDiskDriver       string   // Only used by the xhyve driver
-	DockerEnv             []string // Each entry is formatted as KEY=VALUE.
-	InsecureRegistry      []string
-	RegistryMirror        []string
-	HostOnlyCIDR          string // Only used by the virtualbox driver
-	HypervVirtualSwitch   string
-	KvmNetwork            string             // Only used by the KVM driver
-	Downloader            util.ISODownloader `json:"-"`
-	DockerOpt             []string           // Each entry is formatted as KEY=VALUE.
-	DisableDriverMounts   bool               // Only used by virtualbox and xhyve
-	HyperkitNFSShare      []string
-	HyperkitNFSSharesRoot string
+	MinikubeISO         string
+	Memory              int
+	CPUs                int
+	DiskSize            int
+	VMDriver            string
+	XhyveDiskDriver     string   // Only used by the xhyve driver
+	DockerEnv           []string // Each entry is formatted as KEY=VALUE.
+	InsecureRegistry    []string
+	RegistryMirror      []string
+	HostOnlyCIDR        string // Only used by the virtualbox driver
+	HypervVirtualSwitch string
+	KvmNetwork          string             // Only used by the KVM driver
+	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