Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
4c22593d
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 搜索 >>
提交
4c22593d
编写于
4月 18, 2017
作者:
D
dlorenc
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move more of the libmachine code up into minikube.
上级
61ec2924
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
52 addition
and
10 deletion
+52
-10
pkg/minikube/machine/client.go
pkg/minikube/machine/client.go
+52
-10
未找到文件。
pkg/minikube/machine/client.go
浏览文件 @
4c22593d
...
...
@@ -26,6 +26,7 @@ import (
"time"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/provision"
"github.com/docker/machine/drivers/virtualbox"
"github.com/docker/machine/libmachine"
...
...
@@ -37,8 +38,10 @@ import (
"github.com/docker/machine/libmachine/drivers/rpc"
"github.com/docker/machine/libmachine/engine"
"github.com/docker/machine/libmachine/host"
"github.com/docker/machine/libmachine/mcnutils"
"github.com/docker/machine/libmachine/persist"
"github.com/docker/machine/libmachine/ssh"
"github.com/docker/machine/libmachine/state"
"github.com/docker/machine/libmachine/swarm"
"github.com/docker/machine/libmachine/version"
"github.com/pkg/errors"
...
...
@@ -172,12 +175,51 @@ func (api *LocalClient) Load(name string) (*host.Host, error) {
func
(
api
*
LocalClient
)
Close
()
error
{
return
nil
}
// TODO(r2d4): We can rewrite the create function,
// for now, just defer to libmachine's implementation
func
(
api
*
LocalClient
)
Create
(
h
*
host
.
Host
)
error
{
c
:=
libmachine
.
NewClient
(
api
.
storePath
,
api
.
certsDir
)
c
.
SSHClientType
=
ssh
.
Native
return
c
.
Create
(
h
)
steps
:=
[]
struct
{
name
string
f
func
()
error
}{
{
"Bootstrapping certs."
,
func
()
error
{
return
cert
.
BootstrapCertificates
(
h
.
AuthOptions
())
},
},
{
"Running precreate checks."
,
h
.
Driver
.
PreCreateCheck
,
},
{
"Saving driver."
,
func
()
error
{
return
api
.
Save
(
h
)
},
},
{
"Creating VM."
,
h
.
Driver
.
Create
,
},
{
"Waiting for VM to start."
,
func
()
error
{
return
mcnutils
.
WaitFor
(
drivers
.
MachineInState
(
h
.
Driver
,
state
.
Running
))
},
},
{
"Provisioning VM."
,
func
()
error
{
pv
:=
provision
.
NewBuildrootProvisioner
(
h
.
Driver
)
return
pv
.
Provision
(
*
h
.
HostOptions
.
SwarmOptions
,
*
h
.
HostOptions
.
AuthOptions
,
*
h
.
HostOptions
.
EngineOptions
)
},
},
}
for
_
,
step
:=
range
steps
{
if
err
:=
step
.
f
();
err
!=
nil
{
return
errors
.
Wrap
(
err
,
fmt
.
Sprintf
(
"Error executing step: %s
\n
"
,
step
.
name
))
}
}
return
nil
}
func
StartDriver
()
{
...
...
@@ -190,11 +232,6 @@ func StartDriver() {
localbinary
.
CurrentBinaryIsDockerMachine
=
true
}
// CertGenerator is used to override the default machine CertGenerator with a longer timeout.
type
CertGenerator
struct
{
cert
.
X509CertGenerator
}
type
ConnChecker
struct
{
}
...
...
@@ -207,6 +244,11 @@ func (cc *ConnChecker) Check(h *host.Host, swarm bool) (string, *auth.Options, e
return
dockerHost
,
authOptions
,
nil
}
// CertGenerator is used to override the default machine CertGenerator with a longer timeout.
type
CertGenerator
struct
{
cert
.
X509CertGenerator
}
// ValidateCertificate is a reimplementation of the default generator with a longer timeout.
func
(
cg
*
CertGenerator
)
ValidateCertificate
(
addr
string
,
authOptions
*
auth
.
Options
)
(
bool
,
error
)
{
tlsConfig
,
err
:=
cg
.
ReadTLSConfig
(
addr
,
authOptions
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录