merge the --mount and --mount-string flags into --mount

Author: henry3260

cmd/minikube/cmd/start.go

@@ -269,16 +269,17 @@ func runStart(cmd *cobra.Command, _ []string) {
 
 	validateBuiltImageVersion(starter.Runner, ds.Name)
 
-	if viper.GetBool(createMount) {
+	if cmd.Flags().Changed(createMount) || cmd.Flags().Changed(mountString) {
 		warnAboutMountFlag()
 	}
 
-	if existing != nil && driver.IsKIC(existing.Driver) && viper.GetString(mountString) != "" {
+	if existing != nil && driver.IsKIC(existing.Driver) && cmd.Flags().Changed(createMount) {
 		old := ""
 		if len(existing.ContainerVolumeMounts) > 0 {
 			old = existing.ContainerVolumeMounts[0]
 		}
-		if mount := viper.GetString(mountString); old != mount {
+		_, mount := interpretMountFlag(cmd)
+		if old != mount {
 			exit.Message(reason.GuestMountConflict, "Sorry, {{.driver}} does not allow mounts to be changed after container creation (previous mount: '{{.old}}', new mount: '{{.new}})'", out.V{
 				"driver": existing.Driver,
 				"new":    mount,

cmd/minikube/cmd/start_flags.go

@@ -173,8 +173,8 @@ func initMinikubeFlags() {
 	startCmd.Flags().Bool(keepContext, false, "This will keep the existing kubectl context and will create a minikube context.")
 	startCmd.Flags().Bool(embedCerts, false, "if true, will embed the certs in kubeconfig.")
 	startCmd.Flags().StringP(containerRuntime, "c", constants.DefaultContainerRuntime, fmt.Sprintf("The container runtime to be used. Valid options: %s (default: auto)", strings.Join(cruntime.ValidRuntimes(), ", ")))
-	startCmd.Flags().Bool(createMount, false, "Kept for backward compatibility, value is ignored.")
-	startCmd.Flags().String(mountString, "", "Directory to mount in the guest using format '/host-path:/guest-path'.")
+	startCmd.Flags().String(createMount, "", "Kept for backward compatibility, value is ignored.")
+	startCmd.Flags().String(mountString, "", "DEPRECATED: specify mount path in old style")
 	startCmd.Flags().String(mount9PVersion, defaultMount9PVersion, mount9PVersionDescription)
 	startCmd.Flags().String(mountGID, defaultMountGID, mountGIDDescription)
 	startCmd.Flags().String(mountIPFlag, defaultMountIP, mountIPDescription)
@@ -655,7 +655,7 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str
 	}
 	cc.VerifyComponents = interpretWaitFlag(*cmd)
 
-	if viper.GetString(mountString) != "" && driver.IsKIC(drvName) {
+	if cmd.Flags().Changed(createMount) && driver.IsKIC(drvName) {
 		cc.ContainerVolumeMounts = []string{viper.GetString(mountString)}
 	}
 
@@ -922,6 +922,11 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		cc.ScheduledStop = nil
 	}
 
+	if cmd.Flags().Changed(createMount) || cmd.Flags().Changed(mountString) {
+		cc.Mount, cc.MountString = interpretMountFlag(cmd)
+		klog.Infof("Parsed mount flags => Mount: %v, MountString: %q", cc.Mount, cc.MountString)
+	}
+
 	return cc
 }
 
@@ -1012,6 +1017,39 @@ func interpretWaitFlag(cmd cobra.Command) map[string]bool {
 	return waitComponents
 }
 
+func interpretMountFlag(cmd *cobra.Command) (bool, string) {
+	mountBool := false
+	mountPath := ""
+
+	mountVal, _ := cmd.Flags().GetString(createMount)
+	mountStringFlag, _ := cmd.Flags().GetString(mountString)
+
+	if mountVal == "" && mountStringFlag == "" {
+		klog.Infof("No mount flag provided. Mount disabled by default.")
+		return false, ""
+	}
+
+	// parse mount flag
+	if mountVal == "true" {
+		mountBool = true
+	} else if mountVal == "false" || mountVal == "none" {
+		mountBool = false
+	} else if mountVal != "" {
+		// mount=/host:/guest
+		mountBool = true
+		mountPath = mountVal
+	}
+
+	// mount-string flag takes precedence over create-mount flag
+	if mountStringFlag != "" {
+		mountBool = true
+		mountPath = mountStringFlag
+	}
+
+	klog.Infof("Mount enabled: %v, Mount path: %q", mountBool, mountPath)
+	return mountBool, mountPath
+}
+
 func checkExtraDiskOptions(cmd *cobra.Command, driverName string) {
 	supportedDrivers := []string{driver.HyperKit, driver.KVM2, driver.QEMU2, driver.VFKit, driver.Krunkit}
 

pkg/minikube/config/types.go

@@ -88,6 +88,7 @@ type ClusterConfig struct {
 	MultiNodeRequested      bool
 	ExtraDisks              int // currently only implemented for hyperkit and kvm2
 	CertExpiration          time.Duration
+	Mount                   bool
 	MountString             string
 	Mount9PVersion          string
 	MountGID                string