Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
dab20a2e
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,发现更多精彩内容 >>
未验证
提交
dab20a2e
编写于
9月 02, 2020
作者:
T
Thomas Strömberg
提交者:
GitHub
9月 02, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9163 from tstromberg/driver-advice
docker: Improve overlay module check (behavior & UX)
上级
914f10b4
1fdf1637
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
37 deletion
+16
-37
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+1
-5
pkg/minikube/driver/driver.go
pkg/minikube/driver/driver.go
+2
-2
pkg/minikube/registry/drvs/docker/docker.go
pkg/minikube/registry/drvs/docker/docker.go
+13
-30
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
dab20a2e
...
...
@@ -648,11 +648,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
glog
.
Infof
(
"status for %s: %+v"
,
name
,
st
)
if
st
.
NeedsImprovement
{
out
.
WarnReason
(
reason
.
Kind
{
ID
:
fmt
.
Sprintf
(
"PROVIDER_%s_IMPROVEMENT"
,
strings
.
ToUpper
(
name
)),
Advice
:
translate
.
T
(
st
.
Fix
),
Style
:
style
.
Improvement
,
},
`The '{{.driver}}' driver reported a performance issue`
,
out
.
V
{
"driver"
:
name
})
out
.
T
(
style
.
Improvement
,
`For improved {{.driver}} performance, {{.fix}}`
,
out
.
V
{
"driver"
:
driver
.
FullName
(
ds
.
Name
),
"fix"
:
translate
.
T
(
st
.
Fix
)})
}
if
st
.
Error
==
nil
{
...
...
pkg/minikube/driver/driver.go
浏览文件 @
dab20a2e
...
...
@@ -178,9 +178,9 @@ func FullName(name string) string {
switch
name
{
case
oci
.
Docker
:
if
IsDockerDesktop
(
name
)
{
return
"Docker
for
Desktop"
return
"Docker Desktop"
}
return
"Docker
Service
"
return
"Docker"
default
:
return
strings
.
Title
(
name
)
}
...
...
pkg/minikube/registry/drvs/docker/docker.go
浏览文件 @
dab20a2e
...
...
@@ -19,6 +19,7 @@ package docker
import
(
"context"
"fmt"
"os"
"os/exec"
"runtime"
"strings"
...
...
@@ -119,42 +120,24 @@ func status() registry.State {
func
checkNeedsImprovement
()
registry
.
State
{
if
runtime
.
GOOS
==
"linux"
{
return
checkOverlayMod
()
}
// TODO #8540: on non-linux check if docker desktop has enough CPU/memory
}
return
registry
.
State
{
Installed
:
true
,
Healthy
:
true
}
}
// checkOverlayMod checks if
func
checkOverlayMod
()
registry
.
State
{
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
6
*
time
.
Second
)
defer
cancel
()
cmd
:=
exec
.
CommandContext
(
ctx
,
"modprobe"
,
"overlay"
)
_
,
err
:=
cmd
.
Output
()
if
err
!=
nil
{
// try a different way
cmd
=
exec
.
CommandContext
(
ctx
,
"uname"
,
"-r"
)
out
,
err
:=
cmd
.
Output
()
if
ctx
.
Err
()
==
context
.
DeadlineExceeded
{
glog
.
Warningf
(
"%q timed out checking for "
,
strings
.
Join
(
cmd
.
Args
,
" "
))
return
registry
.
State
{
NeedsImprovement
:
true
,
Installed
:
true
,
Healthy
:
true
,
Fix
:
"enable overlayfs kernel module on your Linux"
}
}
if
err
!=
nil
{
glog
.
Warningf
(
"couldn't verify the linux distro's uname : %s"
,
err
)
return
registry
.
State
{
NeedsImprovement
:
true
,
Installed
:
true
,
Healthy
:
true
,
Fix
:
"enable overlayfs kernel module on your Linux"
}
}
path
:=
fmt
.
Sprintf
(
"/lib/modules/%s/modules.builtin"
,
string
(
out
))
cmd
=
exec
.
CommandContext
(
ctx
,
"cat"
,
path
)
out
,
err
=
cmd
.
Output
()
if
err
!=
nil
{
glog
.
Warningf
(
"overlay module was not found in %q"
,
path
)
return
registry
.
State
{
NeedsImprovement
:
true
,
Installed
:
true
,
Healthy
:
true
,
Fix
:
"enable overlayfs kernel module on your Linux"
}
}
if
strings
.
Contains
(
string
(
out
),
"overlay"
)
{
// success
return
registry
.
State
{
NeedsImprovement
:
false
,
Installed
:
true
,
Healthy
:
true
}
}
glog
.
Warningf
(
"overlay module was not found"
)
return
registry
.
State
{
NeedsImprovement
:
true
,
Installed
:
true
,
Healthy
:
true
}
if
_
,
err
:=
os
.
Stat
(
"/sys/module/overlay"
);
err
==
nil
{
glog
.
Info
(
"overlay module found"
)
return
registry
.
State
{
Installed
:
true
,
Healthy
:
true
}
}
return
registry
.
State
{
Installed
:
true
,
Healthy
:
true
}
if
_
,
err
:=
os
.
Stat
(
"/sys/module/overlay2"
);
err
==
nil
{
glog
.
Info
(
"overlay2 module found"
)
return
registry
.
State
{
Installed
:
true
,
Healthy
:
true
}
}
glog
.
Warningf
(
"overlay modules were not found"
)
return
registry
.
State
{
NeedsImprovement
:
true
,
Installed
:
true
,
Healthy
:
true
,
Fix
:
"enable the overlay Linux kernel module using 'modprobe overlay'"
}
}
// suggestFix matches a stderr with possible fix for the docker driver
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录