kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6693 from tstromberg/mount-try 

Explicitly set TCP as the default 9p transmission method
pull/6699/head
Medya Ghazizadeh 2020-02-19 14:41:45 -08:00 committed by GitHub
parent 1f2d3abc87 58eaa66825
commit 98294b5ec1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/minikube/cluster/mount.go
View File

@ -105,7 +105,9 @@ func mntCmd(source string, target string, c *MountConfig) string {
options := map[string]string{
"dfltgid": resolveGID(c.GID),
"dfltuid": resolveUID(c.UID),
"trans": "tcp",
}
if c.Port != 0 {
options["port"] = strconv.Itoa(c.Port)
}

8
pkg/minikube/cluster/mount_test.go
View File

@ -36,14 +36,14 @@ func TestMntCmd(t *testing.T) {
source: "src",
target: "target",
cfg: &MountConfig{Type: "9p", Mode: os.FileMode(0700)},
want: "sudo mount -t 9p -o dfltgid=0,dfltuid=0 src target",
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"},
want: "sudo mount -t 9p -o dfltgid=$(grep ^docker: /etc/group | cut -d: -f3),dfltuid=$(id -u docker) src target",
want: "sudo mount -t 9p -o dfltgid=$(grep ^docker: /etc/group | cut -d: -f3),dfltuid=$(id -u docker),trans=tcp src target",
},
{
name: "everything",
@ -53,7 +53,7 @@ func TestMntCmd(t *testing.T) {
"noextend": "",
"cache": "fscache",
}},
want: "sudo mount -t 9p -o cache=fscache,dfltgid=72,dfltuid=82,noextend,version=9p2000.u 10.0.0.1 /target",
want: "sudo mount -t 9p -o cache=fscache,dfltgid=72,dfltuid=82,noextend,trans=tcp,version=9p2000.u 10.0.0.1 /target",
},
{
name: "version-conflict",
@ -62,7 +62,7 @@ func TestMntCmd(t *testing.T) {
cfg: &MountConfig{Type: "9p", Mode: os.FileMode(0700), Version: "9p2000.u", Options: map[string]string{
"version": "9p2000.L",
}},
want: "sudo mount -t 9p -o dfltgid=0,dfltuid=0,version=9p2000.L src tgt",
want: "sudo mount -t 9p -o dfltgid=0,dfltuid=0,trans=tcp,version=9p2000.L src tgt",
},
}