Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
bdd1e6de
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,发现更多精彩内容 >>
未验证
提交
bdd1e6de
编写于
2月 05, 2021
作者:
M
Medya Ghazizadeh
提交者:
GitHub
2月 05, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10356 from afbjorklund/cri-socket-wait
Wait for the CRI socket to be created properly
上级
2c60c126
07ea0ec0
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
42 addition
and
0 deletion
+42
-0
pkg/minikube/node/start.go
pkg/minikube/node/start.go
+42
-0
未找到文件。
pkg/minikube/node/start.go
浏览文件 @
bdd1e6de
...
@@ -277,6 +277,12 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k
...
@@ -277,6 +277,12 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k
exit
.
Error
(
reason
.
RuntimeEnable
,
"Failed to enable container runtime"
,
err
)
exit
.
Error
(
reason
.
RuntimeEnable
,
"Failed to enable container runtime"
,
err
)
}
}
// Wait for the CRI to be "live", before returning it
err
=
waitForCRISocket
(
runner
,
cr
.
SocketPath
(),
60
,
1
)
if
err
!=
nil
{
exit
.
Error
(
reason
.
RuntimeEnable
,
"Failed to start container runtime"
,
err
)
}
return
cr
return
cr
}
}
...
@@ -284,6 +290,42 @@ func forceSystemd() bool {
...
@@ -284,6 +290,42 @@ func forceSystemd() bool {
return
viper
.
GetBool
(
"force-systemd"
)
||
os
.
Getenv
(
constants
.
MinikubeForceSystemdEnv
)
==
"true"
return
viper
.
GetBool
(
"force-systemd"
)
||
os
.
Getenv
(
constants
.
MinikubeForceSystemdEnv
)
==
"true"
}
}
func
pathExists
(
runner
cruntime
.
CommandRunner
,
path
string
)
(
bool
,
error
)
{
_
,
err
:=
runner
.
RunCmd
(
exec
.
Command
(
"stat"
,
path
))
if
err
==
nil
{
return
true
,
nil
}
if
os
.
IsNotExist
(
err
)
{
return
false
,
nil
}
return
false
,
err
}
func
waitForCRISocket
(
runner
cruntime
.
CommandRunner
,
socket
string
,
wait
int
,
interval
int
)
error
{
if
socket
==
""
||
socket
==
"/var/run/dockershim.sock"
{
return
nil
}
klog
.
Infof
(
"Will wait %ds for socket path %s"
,
wait
,
socket
)
chkPath
:=
func
()
error
{
e
,
err
:=
pathExists
(
runner
,
socket
)
if
err
!=
nil
{
return
err
}
if
!
e
{
return
&
retry
.
RetriableError
{
Err
:
err
}
}
return
nil
}
if
err
:=
retry
.
Expo
(
chkPath
,
time
.
Duration
(
interval
)
*
time
.
Second
,
time
.
Duration
(
wait
)
*
time
.
Second
);
err
!=
nil
{
return
err
}
return
nil
}
// setupKubeAdm adds any requested files into the VM before Kubernetes is started
// setupKubeAdm adds any requested files into the VM before Kubernetes is started
func
setupKubeAdm
(
mAPI
libmachine
.
API
,
cfg
config
.
ClusterConfig
,
n
config
.
Node
,
r
command
.
Runner
)
bootstrapper
.
Bootstrapper
{
func
setupKubeAdm
(
mAPI
libmachine
.
API
,
cfg
config
.
ClusterConfig
,
n
config
.
Node
,
r
command
.
Runner
)
bootstrapper
.
Bootstrapper
{
bs
,
err
:=
cluster
.
Bootstrapper
(
mAPI
,
viper
.
GetString
(
cmdcfg
.
Bootstrapper
),
cfg
,
r
)
bs
,
err
:=
cluster
.
Bootstrapper
(
mAPI
,
viper
.
GetString
(
cmdcfg
.
Bootstrapper
),
cfg
,
r
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录