Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
bb387039
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,发现更多精彩内容 >>
提交
bb387039
编写于
3月 20, 2020
作者:
S
Sharif Elgamal
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move panic out of library
上级
df608f70
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
8 deletion
+8
-8
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+8
-2
pkg/minikube/driver/driver.go
pkg/minikube/driver/driver.go
+0
-6
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
bb387039
...
...
@@ -465,13 +465,19 @@ func selectDriver(existing *config.ClusterConfig) registry.DriverState {
out
.
T
(
out
.
Warning
,
warning
,
out
.
V
{
"driver"
:
d
,
"vmd"
:
vmd
})
}
ds
:=
driver
.
Status
(
d
)
if
ds
.
Name
==
""
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"The driver '{{.driver}}' is not supported on {{.os}}"
,
out
.
V
{
"driver"
:
d
,
"os"
:
runtime
.
GOOS
})
}
out
.
T
(
out
.
Sparkle
,
`Using the {{.driver}} driver based on user configuration`
,
out
.
V
{
"driver"
:
ds
.
String
()})
return
ds
}
// Fallback to old driver parameter
if
viper
.
GetString
(
"vm-driver"
)
!=
""
{
if
d
:=
viper
.
GetString
(
"vm-driver"
);
d
!=
""
{
ds
:=
driver
.
Status
(
viper
.
GetString
(
"vm-driver"
))
if
ds
.
Name
==
""
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"The driver '{{.driver}}' is not supported on {{.os}}"
,
out
.
V
{
"driver"
:
d
,
"os"
:
runtime
.
GOOS
})
}
out
.
T
(
out
.
Sparkle
,
`Using the {{.driver}} driver based on user configuration`
,
out
.
V
{
"driver"
:
ds
.
String
()})
return
ds
}
...
...
@@ -551,7 +557,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
name
:=
ds
.
Name
glog
.
Infof
(
"validating driver %q against %+v"
,
name
,
existing
)
if
!
driver
.
Supported
(
name
)
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"The driver
{{.experimental}}
'{{.driver}}' is not supported on {{.os}}"
,
out
.
V
{
"driver"
:
name
,
"os"
:
runtime
.
GOOS
})
exit
.
WithCodeT
(
exit
.
Unavailable
,
"The driver '{{.driver}}' is not supported on {{.os}}"
,
out
.
V
{
"driver"
:
name
,
"os"
:
runtime
.
GOOS
})
}
st
:=
ds
.
State
...
...
pkg/minikube/driver/driver.go
浏览文件 @
bb387039
...
...
@@ -19,15 +19,12 @@ package driver
import
(
"fmt"
"os"
"runtime"
"sort"
"strings"
"github.com/golang/glog"
"k8s.io/minikube/pkg/drivers/kic"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/out"
"k8s.io/minikube/pkg/minikube/registry"
)
...
...
@@ -217,9 +214,6 @@ func Suggest(options []registry.DriverState) (registry.DriverState, []registry.D
// Status returns the status of a driver
func
Status
(
name
string
)
registry
.
DriverState
{
d
:=
registry
.
Driver
(
name
)
if
d
.
Empty
()
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"The driver '{{.driver}}' is not supported on {{.os}}"
,
out
.
V
{
"driver"
:
name
,
"os"
:
runtime
.
GOOS
})
}
return
registry
.
DriverState
{
Name
:
d
.
Name
,
Priority
:
d
.
Priority
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录