Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
7fddd05b
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7fddd05b
编写于
2月 20, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
2月 20, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6630 from medyagh/mount_kic
add mount feature to kic drivers
上级
8d178271
cc0caac4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
96 addition
and
7 deletion
+96
-7
cmd/minikube/cmd/mount.go
cmd/minikube/cmd/mount.go
+12
-6
pkg/drivers/kic/oci/network.go
pkg/drivers/kic/oci/network.go
+79
-0
pkg/minikube/cluster/ip.go
pkg/minikube/cluster/ip.go
+4
-0
pkg/minikube/cluster/mount.go
pkg/minikube/cluster/mount.go
+1
-1
未找到文件。
cmd/minikube/cmd/mount.go
浏览文件 @
7fddd05b
...
...
@@ -21,6 +21,7 @@ import (
"net"
"os"
"os/signal"
"runtime"
"strconv"
"strings"
"sync"
...
...
@@ -151,6 +152,15 @@ var mountCmd = &cobra.Command{
cfg
.
Options
[
parts
[
0
]]
=
parts
[
1
]
}
// An escape valve to allow future hackers to try NFS, VirtFS, or other FS types.
if
!
supportedFilesystems
[
cfg
.
Type
]
{
out
.
T
(
out
.
WarningType
,
"{{.type}} is not yet a supported filesystem. We will try anyways!"
,
out
.
V
{
"type"
:
cfg
.
Type
})
}
bindIP
:=
ip
.
String
()
// the ip to listen on the user's host machine
if
driver
.
IsKIC
(
host
.
Driver
.
DriverName
())
&&
runtime
.
GOOS
!=
"linux"
{
bindIP
=
"127.0.0.1"
}
out
.
T
(
out
.
Mounting
,
"Mounting host path {{.sourcePath}} into VM as {{.destinationPath}} ..."
,
out
.
V
{
"sourcePath"
:
hostPath
,
"destinationPath"
:
vmPath
})
out
.
T
(
out
.
Option
,
"Mount type: {{.name}}"
,
out
.
V
{
"type"
:
cfg
.
Type
})
out
.
T
(
out
.
Option
,
"User ID: {{.userID}}"
,
out
.
V
{
"userID"
:
cfg
.
UID
})
...
...
@@ -159,18 +169,14 @@ var mountCmd = &cobra.Command{
out
.
T
(
out
.
Option
,
"Message Size: {{.size}}"
,
out
.
V
{
"size"
:
cfg
.
MSize
})
out
.
T
(
out
.
Option
,
"Permissions: {{.octalMode}} ({{.writtenMode}})"
,
out
.
V
{
"octalMode"
:
fmt
.
Sprintf
(
"%o"
,
cfg
.
Mode
),
"writtenMode"
:
cfg
.
Mode
})
out
.
T
(
out
.
Option
,
"Options: {{.options}}"
,
out
.
V
{
"options"
:
cfg
.
Options
})
// An escape valve to allow future hackers to try NFS, VirtFS, or other FS types.
if
!
supportedFilesystems
[
cfg
.
Type
]
{
out
.
T
(
out
.
WarningType
,
"{{.type}} is not yet a supported filesystem. We will try anyways!"
,
out
.
V
{
"type"
:
cfg
.
Type
})
}
out
.
T
(
out
.
Option
,
"Bind Address: {{.Address}}"
,
out
.
V
{
"Address"
:
net
.
JoinHostPort
(
bindIP
,
fmt
.
Sprint
(
port
))})
var
wg
sync
.
WaitGroup
if
cfg
.
Type
==
nineP
{
wg
.
Add
(
1
)
go
func
()
{
out
.
T
(
out
.
Fileserver
,
"Userspace file server: "
)
ufs
.
StartServer
(
net
.
JoinHostPort
(
ip
.
String
()
,
strconv
.
Itoa
(
port
)),
debugVal
,
hostPath
)
ufs
.
StartServer
(
net
.
JoinHostPort
(
bindIP
,
strconv
.
Itoa
(
port
)),
debugVal
,
hostPath
)
out
.
T
(
out
.
Stopped
,
"Userspace file server is shutdown"
)
wg
.
Done
()
}()
...
...
pkg/drivers/kic/oci/network.go
0 → 100644
浏览文件 @
7fddd05b
/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
oci
import
(
"fmt"
"net"
"os/exec"
"runtime"
"strings"
"github.com/golang/glog"
"github.com/pkg/errors"
)
// RoutableHostIPFromInside returns the ip/dns of the host that container lives on
// is routable from inside the container
func
RoutableHostIPFromInside
(
ociBin
string
,
containerName
string
)
(
net
.
IP
,
error
)
{
if
ociBin
!=
Docker
{
return
nil
,
fmt
.
Errorf
(
"RoutableHostIPFromInside is currently only implemented for docker https://github.com/containers/libpod/issues/5205"
)
}
if
runtime
.
GOOS
==
"linux"
{
return
dockerGatewayIP
()
}
// for windows and mac, the gateway ip is not routable so we use dns trick.
return
digDNS
(
ociBin
,
containerName
,
"host.docker.internal"
)
}
// digDNS will get the IP record for a dns
func
digDNS
(
ociBin
,
containerName
,
dns
string
)
(
net
.
IP
,
error
)
{
if
err
:=
PointToHostDockerDaemon
();
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"point host docker-daemon"
)
}
cmd
:=
exec
.
Command
(
ociBin
,
"exec"
,
"-t"
,
containerName
,
"dig"
,
"+short"
,
dns
)
out
,
err
:=
cmd
.
CombinedOutput
()
ip
:=
net
.
ParseIP
(
strings
.
TrimSpace
(
string
(
out
)))
if
err
!=
nil
{
return
ip
,
errors
.
Wrapf
(
err
,
"resolve dns to ip"
,
string
(
out
))
}
glog
.
Infof
(
"got host ip for mount in container by digging dns: %s"
,
ip
.
String
())
return
ip
,
nil
}
// dockerGatewayIP gets the default gateway ip for the docker bridge on the user's host machine
// gets the ip from user's host docker
func
dockerGatewayIP
()
(
net
.
IP
,
error
)
{
if
err
:=
PointToHostDockerDaemon
();
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"point host docker-daemon"
)
}
cmd
:=
exec
.
Command
(
Docker
,
"network"
,
"ls"
,
"--filter"
,
"name=bridge"
,
"--format"
,
"{{.ID}}"
)
out
,
err
:=
cmd
.
CombinedOutput
()
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"get network bridge. output: %s"
,
string
(
out
))
}
bridgeID
:=
strings
.
TrimSpace
(
string
(
out
))
cmd
=
exec
.
Command
(
Docker
,
"inspect"
,
"--format"
,
"{{(index .IPAM.Config 0).Gateway}}"
,
bridgeID
)
out
,
err
=
cmd
.
CombinedOutput
()
if
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"inspect IP gatway for bridge network: %q. output: %s"
,
string
(
out
),
bridgeID
)
}
ip
:=
net
.
ParseIP
(
strings
.
TrimSpace
(
string
(
out
)))
glog
.
Infof
(
"got host ip for mount in container by inspect docker network: %s"
,
ip
.
String
())
return
ip
,
nil
}
pkg/minikube/cluster/ip.go
浏览文件 @
7fddd05b
...
...
@@ -33,6 +33,10 @@ import (
// GetVMHostIP gets the ip address to be used for mapping host -> VM and VM -> host
func
GetVMHostIP
(
host
*
host
.
Host
)
(
net
.
IP
,
error
)
{
switch
host
.
DriverName
{
case
driver
.
Docker
:
return
oci
.
RoutableHostIPFromInside
(
oci
.
Docker
,
host
.
Name
)
case
driver
.
Podman
:
return
oci
.
RoutableHostIPFromInside
(
oci
.
Podman
,
host
.
Name
)
case
driver
.
KVM2
:
return
net
.
ParseIP
(
"192.168.39.1"
),
nil
case
driver
.
HyperV
:
...
...
pkg/minikube/cluster/mount.go
浏览文件 @
7fddd05b
...
...
@@ -60,7 +60,7 @@ func Mount(r mountRunner, source string, target string, c *MountConfig) error {
return
errors
.
Wrap
(
err
,
"umount"
)
}
if
_
,
err
:=
r
.
RunCmd
(
exec
.
Command
(
"/bin/bash"
,
"-c"
,
fmt
.
Sprintf
(
"sudo mkdir -m %o -p %s
&& %s"
,
c
.
Mode
,
target
,
mntCmd
(
source
,
target
,
c
)
)));
err
!=
nil
{
if
_
,
err
:=
r
.
RunCmd
(
exec
.
Command
(
"/bin/bash"
,
"-c"
,
fmt
.
Sprintf
(
"sudo mkdir -m %o -p %s
"
,
c
.
Mode
,
target
)));
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"create folder pre-mount"
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录