Merge pull request #13162 from spowelljr/removeMountModeFlag

mount: Remove `--mode` flag

Author: sharifelgamal

Diff for: cmd/minikube/cmd/mount.go

@@ -51,8 +51,6 @@ const (
 	mountGIDDescription       = "Default group id used for the mount"
 	defaultMountIP            = ""
 	mountIPDescription        = "Specify the ip that the mount should be setup on"
-	defaultMountMode          = 0o755
-	mountModeDescription      = "File permissions used for the mount"
 	defaultMountMSize         = 262144
 	mountMSizeDescription     = "The number of bytes to use for 9p packet payload"
 	mountOptionsDescription   = "Additional mount options, such as cache=fscache"
@@ -79,7 +77,6 @@ var (
 	gid          string
 	mSize        int
 	options      []string
-	mode         uint
 )
 
 // supportedFilesystems is a map of filesystem types to not warn against.
@@ -166,7 +163,6 @@ var mountCmd = &cobra.Command{
 			Version: mountVersion,
 			MSize:   mSize,
 			Port:    port,
-			Mode:    os.FileMode(mode),
 			Options: map[string]string{},
 		}
 
@@ -194,7 +190,6 @@ var mountCmd = &cobra.Command{
 		out.Infof("Group ID:     {{.groupID}}", out.V{"groupID": cfg.GID})
 		out.Infof("Version:      {{.version}}", out.V{"version": cfg.Version})
 		out.Infof("Message Size: {{.size}}", out.V{"size": cfg.MSize})
-		out.Infof("Permissions:  {{.octalMode}} ({{.writtenMode}})", out.V{"octalMode": fmt.Sprintf("%o", cfg.Mode), "writtenMode": cfg.Mode})
 		out.Infof("Options:      {{.options}}", out.V{"options": cfg.Options})
 		out.Infof("Bind Address: {{.Address}}", out.V{"Address": net.JoinHostPort(bindIP, fmt.Sprint(port))})
 
@@ -245,7 +240,6 @@ func init() {
 	mountCmd.Flags().BoolVar(&isKill, "kill", false, "Kill the mount process spawned by minikube start")
 	mountCmd.Flags().StringVar(&uid, constants.MountUIDFlag, defaultMountUID, mountUIDDescription)
 	mountCmd.Flags().StringVar(&gid, constants.MountGIDFlag, defaultMountGID, mountGIDDescription)
-	mountCmd.Flags().UintVar(&mode, constants.MountModeFlag, defaultMountMode, mountModeDescription)
 	mountCmd.Flags().StringSliceVar(&options, constants.MountOptionsFlag, defaultMountOptions(), mountOptionsDescription)
 	mountCmd.Flags().IntVar(&mSize, constants.MountMSizeFlag, defaultMountMSize, mountMSizeDescription)
 }

Diff for: cmd/minikube/cmd/start_flags.go

@@ -86,7 +86,6 @@ const (
 	mount9PVersion          = "mount-9p-version"
 	mountGID                = "mount-gid"
 	mountIPFlag             = "mount-ip"
-	mountMode               = "mount-mode"
 	mountMSize              = "mount-msize"
 	mountOptions            = "mount-options"
 	mountPortFlag           = "mount-port"
@@ -165,7 +164,6 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(mount9PVersion, defaultMount9PVersion, mount9PVersionDescription)
 	startCmd.Flags().String(mountGID, defaultMountGID, mountGIDDescription)
 	startCmd.Flags().String(mountIPFlag, defaultMountIP, mountIPDescription)
-	startCmd.Flags().Uint(mountMode, defaultMountMode, mountModeDescription)
 	startCmd.Flags().Int(mountMSize, defaultMountMSize, mountMSizeDescription)
 	startCmd.Flags().StringSlice(mountOptions, defaultMountOptions(), mountOptionsDescription)
 	startCmd.Flags().Uint16(mountPortFlag, defaultMountPort, mountPortDescription)
@@ -487,7 +485,6 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, drvName s
 		Mount9PVersion:          viper.GetString(mount9PVersion),
 		MountGID:                viper.GetString(mountGID),
 		MountIP:                 viper.GetString(mountIPFlag),
-		MountMode:               viper.GetUint(mountMode),
 		MountMSize:              viper.GetInt(mountMSize),
 		MountOptions:            viper.GetStringSlice(mountOptions),
 		MountPort:               uint16(viper.GetUint(mountPortFlag)),
@@ -705,7 +702,6 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 	updateStringFromFlag(cmd, &cc.Mount9PVersion, mount9PVersion)
 	updateStringFromFlag(cmd, &cc.MountGID, mountGID)
 	updateStringFromFlag(cmd, &cc.MountIP, mountIPFlag)
-	updateUintFromFlag(cmd, &cc.MountMode, mountMode)
 	updateIntFromFlag(cmd, &cc.MountMSize, mountMSize)
 	updateStringSliceFromFlag(cmd, &cc.MountOptions, mountOptions)
 	updateUint16FromFlag(cmd, &cc.MountPort, mountPortFlag)
@@ -782,13 +778,6 @@ func updateDurationFromFlag(cmd *cobra.Command, v *time.Duration, key string) {
 	}
 }
 
-// updateUintFromFlag will update the existing uint from the flag.
-func updateUintFromFlag(cmd *cobra.Command, v *uint, key string) {
-	if cmd.Flags().Changed(key) {
-		*v = viper.GetUint(key)
-	}
-}
-
 // updateUint16FromFlag will update the existing uint16 from the flag.
 func updateUint16FromFlag(cmd *cobra.Command, v *uint16, key string) {
 	if cmd.Flags().Changed(key) {

Diff for: pkg/minikube/cluster/mount.go

@@ -18,9 +18,7 @@ package cluster
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
-	"runtime"
 	"sort"
 	"strconv"
 	"strings"
@@ -44,8 +42,6 @@ type MountConfig struct {
 	MSize int
 	// Port is the port to connect to on the host
 	Port int
-	// Mode is the file permissions to set the mount to (octals)
-	Mode os.FileMode
 	// Extra mount options. See https://www.kernel.org/doc/Documentation/filesystems/9p.txt
 	Options map[string]string
 }
@@ -82,7 +78,7 @@ func Mount(r mountRunner, source string, target string, c *MountConfig) error {
 		return &MountError{ErrorType: MountErrorUnknown, UnderlyingError: errors.Wrap(err, "umount")}
 	}
 
-	if _, err := r.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mkdir -m %o -p %s", c.Mode, target))); err != nil {
+	if _, err := r.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo mkdir -p %s", target))); err != nil {
 		return &MountError{ErrorType: MountErrorUnknown, UnderlyingError: errors.Wrap(err, "create folder pre-mount")}
 	}
 
@@ -94,13 +90,6 @@ func Mount(r mountRunner, source string, target string, c *MountConfig) error {
 		return &MountError{ErrorType: MountErrorUnknown, UnderlyingError: errors.Wrapf(err, "mount with cmd %s ", rr.Command())}
 	}
 
-	// skipping macOS due to https://github.com/kubernetes/minikube/issues/13070
-	if runtime.GOOS != "darwin" {
-		if _, err := r.RunCmd(exec.Command("/bin/bash", "-c", fmt.Sprintf("sudo chmod %o %s", c.Mode, target))); err != nil {
-			return &MountError{ErrorType: MountErrorChmod, UnderlyingError: errors.Wrap(err, "chmod folder")}
-		}
-	}
-
 	klog.Infof("mount successful: %q", rr.Output())
 	return nil
 }

Diff for: pkg/minikube/cluster/mount_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package cluster
 
 import (
-	"os"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -35,21 +34,21 @@ func TestMntCmd(t *testing.T) {
 			name:   "simple",
 			source: "src",
 			target: "target",
-			cfg:    &MountConfig{Type: "9p", Mode: os.FileMode(0700)},
+			cfg:    &MountConfig{Type: "9p"},
 			want:   "sudo mount -t 9p -o dfltgid=0,dfltuid=0,trans=tcp src target",
 		},
 		{
 			name:   "named uid",
 			source: "src",
 			target: "target",
-			cfg:    &MountConfig{Type: "9p", Mode: os.FileMode(0700), UID: "docker", GID: "docker"},
+			cfg:    &MountConfig{Type: "9p", UID: "docker", GID: "docker"},
 			want:   "sudo mount -t 9p -o dfltgid=$(grep ^docker: /etc/group | cut -d: -f3),dfltuid=$(id -u docker),trans=tcp src target",
 		},
 		{
 			name:   "everything",
 			source: "10.0.0.1",
 			target: "/target",
-			cfg: &MountConfig{Type: "9p", Mode: os.FileMode(0777), UID: "82", GID: "72", Version: "9p2000.u", Options: map[string]string{
+			cfg: &MountConfig{Type: "9p", UID: "82", GID: "72", Version: "9p2000.u", Options: map[string]string{
 				"noextend": "",
 				"cache":    "fscache",
 			}},
@@ -59,7 +58,7 @@ func TestMntCmd(t *testing.T) {
 			name:   "version-conflict",
 			source: "src",
 			target: "tgt",
-			cfg: &MountConfig{Type: "9p", Mode: os.FileMode(0700), Version: "9p2000.u", Options: map[string]string{
+			cfg: &MountConfig{Type: "9p", Version: "9p2000.u", Options: map[string]string{
 				"version": "9p2000.L",
 			}},
 			want: "sudo mount -t 9p -o dfltgid=0,dfltuid=0,trans=tcp,version=9p2000.L src tgt",

Diff for: pkg/minikube/config/types.go

@@ -90,7 +90,6 @@ type ClusterConfig struct {
 	Mount9PVersion          string
 	MountGID                string
 	MountIP                 string
-	MountMode               uint
 	MountMSize              int
 	MountOptions            []string
 	MountPort               uint16

Diff for: pkg/minikube/constants/constants.go

@@ -133,8 +133,6 @@ const (
 	MountIPFlag = "ip"
 	// MountMSizeFlag is the flag used to set the mount msize
 	MountMSizeFlag = "msize"
-	// MountModeFlag is the flag used to set the mount mode
-	MountModeFlag = "mode"
 	// MountOptionsFlag is the flag used to set the mount options
 	MountOptionsFlag = "options"
 	// MountPortFlag is the flag used to set the mount port

Diff for: pkg/minikube/node/config.go

@@ -95,7 +95,6 @@ func generateMountArgs(profile string, cc config.ClusterConfig) []string {
 		{constants.MountGIDFlag, cc.MountGID},
 		{constants.MountIPFlag, cc.MountIP},
 		{constants.MountMSizeFlag, fmt.Sprintf("%d", cc.MountMSize)},
-		{constants.MountModeFlag, fmt.Sprintf("%d", cc.MountMode)},
 		{constants.MountPortFlag, fmt.Sprintf("%d", cc.MountPort)},
 		{constants.MountTypeFlag, cc.MountType},
 		{constants.MountUIDFlag, cc.MountUID},

Diff for: site/content/en/docs/commands/mount.md

@@ -24,7 +24,6 @@ minikube mount [flags] <source directory>:<target directory>
       --gid string          Default group id used for the mount (default "docker")
       --ip string           Specify the ip that the mount should be setup on
       --kill                Kill the mount process spawned by minikube start
-      --mode uint           File permissions used for the mount (default 493)
       --msize int           The number of bytes to use for 9p packet payload (default 262144)
       --options strings     Additional mount options, such as cache=fscache
       --port uint16         Specify the port that the mount should be setup on, where 0 means any free port.

Diff for: site/content/en/docs/commands/start.md

@@ -80,7 +80,6 @@ minikube start [flags]
       --mount-9p-version string           Specify the 9p version that the mount should use (default "9p2000.L")
       --mount-gid string                  Default group id used for the mount (default "docker")
       --mount-ip string                   Specify the ip that the mount should be setup on
-      --mount-mode uint                   File permissions used for the mount (default 493)
       --mount-msize int                   The number of bytes to use for 9p packet payload (default 262144)
       --mount-options strings             Additional mount options, such as cache=fscache
       --mount-port uint16                 Specify the port that the mount should be setup on, where 0 means any free port.

Diff for: test/integration/mount_start_test.go

@@ -23,15 +23,13 @@ import (
 	"context"
 	"fmt"
 	"os/exec"
-	"runtime"
 	"strings"
 	"testing"
 )
 
 const (
 	mountGID   = "0"
 	mountMSize = "6543"
-	mountMode  = "0777"
 	mountPort  = "46464"
 	mountUID   = "0"
 )
@@ -83,7 +81,7 @@ func TestMountStart(t *testing.T) {
 func validateStartWithMount(ctx context.Context, t *testing.T, profile string) {
 	defer PostMortemLogs(t, profile)
 
-	args := []string{"start", "-p", profile, "--memory=2048", "--mount", "--mount-gid", mountGID, "--mount-msize", mountMSize, "--mount-mode", mountMode, "--mount-port", mountPort, "--mount-uid", mountUID}
+	args := []string{"start", "-p", profile, "--memory=2048", "--mount", "--mount-gid", mountGID, "--mount-msize", mountMSize, "--mount-port", mountPort, "--mount-uid", mountUID}
 	args = append(args, StartArgs()...)
 	rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
 	if err != nil {
@@ -105,27 +103,8 @@ func validateMount(ctx context.Context, t *testing.T, profile string) {
 	}
 
 	// Docker has it's own mounting method, it doesn't respect the mounting flags
-	if DockerDriver() {
-		return
-	}
-
-	// skipping macOS due to https://github.com/kubernetes/minikube/issues/13070
-	if runtime.GOOS != "darwin" {
-		args = sshArgs
-		args = append(args, "stat", "--format", "'%a'", "/minikube-host")
-		rr, err = Run(t, exec.CommandContext(ctx, Target(), args...))
-		if err != nil {
-			t.Fatalf("failed to get directory mode: %v", err)
-		}
-
-		const want = "777"
-		if !strings.Contains(rr.Output(), want) {
-			t.Errorf("wanted mode to be %q; got: %q", want, rr.Output())
-		}
-	}
-
 	// We can't get the mount details with Hyper-V
-	if HyperVDriver() {
+	if DockerDriver() || HyperVDriver() {
 		return
 	}
 

Diff for: translations/de.json

@@ -444,7 +444,6 @@
 	"Paused {{.count}} containers": "",
 	"Paused {{.count}} containers in: {{.namespaces}}": "",
 	"Pausing node {{.name}} ... ": "",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "",
 	"Please either authenticate to the registry or use --base-image flag to use a different registry.": "",

Diff for: translations/es.json

@@ -453,7 +453,6 @@
 	"Paused {{.count}} containers": "",
 	"Paused {{.count}} containers in: {{.namespaces}}": "",
 	"Pausing node {{.name}} ... ": "",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "",
 	"Please either authenticate to the registry or use --base-image flag to use a different registry.": "",

Diff for: translations/ja.json

@@ -447,7 +447,6 @@
 	"Paused {{.count}} containers in: {{.namespaces}}": "次のnamespaceに存在する {{.count}} 個のコンテナを停止しました: {{.namespaces}}",
 	"Pausing node {{.name}} ...": "ノード {{.name}} を一時停止しています ...",
 	"Pausing node {{.name}} ... ": "",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "",
 	"Please either authenticate to the registry or use --base-image flag to use a different registry.": "",

Diff for: translations/ko.json

@@ -468,7 +468,6 @@
 	"Paused {{.count}} containers": "",
 	"Paused {{.count}} containers in: {{.namespaces}}": "",
 	"Pausing node {{.name}} ... ": "",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "",
 	"Please either authenticate to the registry or use --base-image flag to use a different registry.": "",

Diff for: translations/pl.json

@@ -461,7 +461,6 @@
 	"Paused {{.count}} containers": "Zatrzymane kontenery: {{.count}}",
 	"Paused {{.count}} containers in: {{.namespaces}}": "Zatrzymane kontenery: {{.count}} w przestrzeniach nazw: {{.namespaces}}",
 	"Pausing node {{.name}} ... ": "Zatrzymywanie węzła {{.name}} ... ",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please attach the following file to the GitHub issue:": "Dołącz następujący plik do zgłoszenia problemu na GitHubie:",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "Utwórz klaster z większym rozmiarem dysku: `minikube start --disk SIZE_MB`",

Diff for: translations/ru.json

@@ -419,7 +419,6 @@
 	"Paused {{.count}} containers": "",
 	"Paused {{.count}} containers in: {{.namespaces}}": "",
 	"Pausing node {{.name}} ... ": "",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "",
 	"Please either authenticate to the registry or use --base-image flag to use a different registry.": "",

Diff for: translations/strings.txt

@@ -419,7 +419,6 @@
 	"Paused {{.count}} containers": "",
 	"Paused {{.count}} containers in: {{.namespaces}}": "",
 	"Pausing node {{.name}} ... ": "",
-	"Permissions:  {{.octalMode}} ({{.writtenMode}})": "",
 	"Please also attach the following file to the GitHub issue:": "",
 	"Please create a cluster with bigger disk size: `minikube start --disk SIZE_MB` ": "",
 	"Please either authenticate to the registry or use --base-image flag to use a different registry.": "",