Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
f54af5d6
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,体验更适合开发者的 AI 搜索 >>
提交
f54af5d6
编写于
3月 14, 2020
作者:
V
vikkyomkar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
function name HostPortBinding changed to ForwardedPort
上级
6ec3fca1
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
10 addition
and
10 deletion
+10
-10
cmd/minikube/cmd/docker-env.go
cmd/minikube/cmd/docker-env.go
+1
-1
cmd/minikube/cmd/service.go
cmd/minikube/cmd/service.go
+1
-1
cmd/minikube/cmd/tunnel.go
cmd/minikube/cmd/tunnel.go
+1
-1
pkg/drivers/kic/kic.go
pkg/drivers/kic/kic.go
+1
-1
pkg/drivers/kic/oci/network.go
pkg/drivers/kic/oci/network.go
+3
-3
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+2
-2
pkg/minikube/node/config.go
pkg/minikube/node/config.go
+1
-1
未找到文件。
cmd/minikube/cmd/docker-env.go
浏览文件 @
f54af5d6
...
...
@@ -186,7 +186,7 @@ var dockerEnvCmd = &cobra.Command{
port
:=
constants
.
DockerDaemonPort
if
driver
.
IsKIC
(
host
.
DriverName
)
{
// for kic we need to find what port docker/podman chose for us
hostIP
=
oci
.
DefaultBindIPV4
port
,
err
=
oci
.
HostPortBinding
(
host
.
DriverName
,
profile
,
port
)
port
,
err
=
oci
.
ForwardedPort
(
host
.
DriverName
,
profile
,
port
)
if
err
!=
nil
{
exit
.
WithCodeT
(
exit
.
Failure
,
"Error getting port binding for '{{.driver_name}} driver: {{.error}}"
,
out
.
V
{
"driver_name"
:
host
.
DriverName
,
"error"
:
err
})
}
...
...
cmd/minikube/cmd/service.go
浏览文件 @
f54af5d6
...
...
@@ -131,7 +131,7 @@ func startKicServiceTunnel(svc, configName string) {
exit
.
WithError
(
"error creating clientset"
,
err
)
}
port
,
err
:=
oci
.
HostPortBinding
(
oci
.
Docker
,
configName
,
22
)
port
,
err
:=
oci
.
ForwardedPort
(
oci
.
Docker
,
configName
,
22
)
if
err
!=
nil
{
exit
.
WithError
(
"error getting ssh port"
,
err
)
}
...
...
cmd/minikube/cmd/tunnel.go
浏览文件 @
f54af5d6
...
...
@@ -90,7 +90,7 @@ var tunnelCmd = &cobra.Command{
}()
if
runtime
.
GOOS
==
"darwin"
&&
cfg
.
Driver
==
oci
.
Docker
{
port
,
err
:=
oci
.
HostPortBinding
(
oci
.
Docker
,
cfg
.
Name
,
22
)
port
,
err
:=
oci
.
ForwardedPort
(
oci
.
Docker
,
cfg
.
Name
,
22
)
if
err
!=
nil
{
exit
.
WithError
(
"error getting ssh port"
,
err
)
}
...
...
pkg/drivers/kic/kic.go
浏览文件 @
f54af5d6
...
...
@@ -180,7 +180,7 @@ func (d *Driver) GetSSHHostname() (string, error) {
// GetSSHPort returns port for use with ssh
func
(
d
*
Driver
)
GetSSHPort
()
(
int
,
error
)
{
p
,
err
:=
oci
.
HostPortBinding
(
d
.
OCIBinary
,
d
.
MachineName
,
constants
.
SSHPort
)
p
,
err
:=
oci
.
ForwardedPort
(
d
.
OCIBinary
,
d
.
MachineName
,
constants
.
SSHPort
)
if
err
!=
nil
{
return
p
,
errors
.
Wrap
(
err
,
"get ssh host-port"
)
}
...
...
pkg/drivers/kic/oci/network.go
浏览文件 @
f54af5d6
...
...
@@ -79,12 +79,12 @@ func dockerGatewayIP() (net.IP, error) {
return
ip
,
nil
}
//
HostPortBinding
will return port mapping for a container using cli.
// example :
HostPortBinding
("docker", "minikube", "22")
//
ForwardedPort
will return port mapping for a container using cli.
// example :
ForwardedPort
("docker", "minikube", "22")
// will return the docker assigned port:
// 32769, nil
// only supports TCP ports
func
HostPortBinding
(
ociBinary
string
,
ociID
string
,
contPort
int
)
(
int
,
error
)
{
func
ForwardedPort
(
ociBinary
string
,
ociID
string
,
contPort
int
)
(
int
,
error
)
{
var
out
[]
byte
var
err
error
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
f54af5d6
...
...
@@ -268,7 +268,7 @@ func (k *Bootstrapper) WaitForCluster(cfg config.ClusterConfig, timeout time.Dur
port
:=
cp
.
Port
if
driver
.
IsKIC
(
cfg
.
Driver
)
{
ip
=
oci
.
DefaultBindIPV4
port
,
err
=
oci
.
HostPortBinding
(
cfg
.
Driver
,
cfg
.
Name
,
port
)
port
,
err
=
oci
.
ForwardedPort
(
cfg
.
Driver
,
cfg
.
Name
,
port
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"get host-bind port %d for container %s"
,
port
,
cfg
.
Name
)
}
...
...
@@ -339,7 +339,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
port
:=
n
.
Port
if
driver
.
IsKIC
(
cfg
.
Driver
)
{
ip
=
oci
.
DefaultBindIPV4
port
,
err
=
oci
.
HostPortBinding
(
cfg
.
Driver
,
cfg
.
Name
,
port
)
port
,
err
=
oci
.
ForwardedPort
(
cfg
.
Driver
,
cfg
.
Name
,
port
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"get host-bind port %d for container %s"
,
port
,
cfg
.
Name
)
}
...
...
pkg/minikube/node/config.go
浏览文件 @
f54af5d6
...
...
@@ -160,7 +160,7 @@ func apiServerURL(h host.Host, cc config.ClusterConfig, n config.Node) (string,
// for kic drivers we use 127.0.0.1 instead of node IP,
// because of Docker on MacOs limitations for reaching to container's IP.
hostname
=
oci
.
DefaultBindIPV4
port
,
err
=
oci
.
HostPortBinding
(
h
.
DriverName
,
h
.
Name
,
port
)
port
,
err
=
oci
.
ForwardedPort
(
h
.
DriverName
,
h
.
Name
,
port
)
if
err
!=
nil
{
return
""
,
errors
.
Wrap
(
err
,
"host port binding"
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录