Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
f29c0cd3
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,发现更多精彩内容 >>
未验证
提交
f29c0cd3
编写于
1月 17, 2019
作者:
T
Thomas Strömberg
提交者:
GitHub
1月 17, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3533 from tstromberg/kubeadm-log-output
Improve failure output when kubeadm init fails
上级
e1804d24
c2bf3943
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
8 deletion
+17
-8
cmd/minikube/cmd/start.go
cmd/minikube/cmd/start.go
+1
-1
cmd/util/util.go
cmd/util/util.go
+14
-5
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+1
-1
pkg/minikube/bootstrapper/ssh_runner.go
pkg/minikube/bootstrapper/ssh_runner.go
+1
-1
未找到文件。
cmd/minikube/cmd/start.go
浏览文件 @
f29c0cd3
...
...
@@ -344,7 +344,7 @@ func runStart(cmd *cobra.Command, args []string) {
if
!
exists
||
config
.
VMDriver
==
constants
.
DriverNone
{
fmt
.
Println
(
"Starting cluster components..."
)
if
err
:=
k8sBootstrapper
.
StartCluster
(
kubernetesConfig
);
err
!=
nil
{
glog
.
Error
ln
(
"Error starting cluster:
"
,
err
)
glog
.
Error
f
(
"Error starting cluster: %v
"
,
err
)
cmdutil
.
MaybeReportErrorAndExit
(
err
)
}
}
else
{
...
...
cmd/util/util.go
浏览文件 @
f29c0cd3
...
...
@@ -130,6 +130,7 @@ func MaybeReportErrorAndExit(errToReport error) {
MaybeReportErrorAndExitWithCode
(
errToReport
,
1
)
}
// MaybeReportErrorAndExitWithCode prompts the user if they would like to report a stack trace, and exits.
func
MaybeReportErrorAndExitWithCode
(
errToReport
error
,
returnCode
int
)
{
var
err
error
if
viper
.
GetBool
(
config
.
WantReportError
)
{
...
...
@@ -139,17 +140,24 @@ func MaybeReportErrorAndExitWithCode(errToReport error, returnCode int) {
`================================================================================
An error has occurred. Would you like to opt in to sending anonymized crash
information to minikube to help prevent future errors?
To opt out of these messages, run the command:
minikube config set WantReportErrorPrompt false
To disable this prompt, run: 'minikube config set WantReportErrorPrompt false'
================================================================================`
)
if
PromptUserForAccept
(
os
.
Stdin
)
{
minikubeConfig
.
Set
(
config
.
WantReportError
,
"true"
)
err
=
ReportError
(
errToReport
,
constants
.
ReportingURL
)
err
=
minikubeConfig
.
Set
(
config
.
WantReportError
,
"true"
)
if
err
==
nil
{
err
=
ReportError
(
errToReport
,
constants
.
ReportingURL
)
}
}
else
{
fmt
.
Println
(
"Bummer, perhaps next time!"
)
}
}
// This happens when the error was created without errors.Wrap(), and thus has no trace data.
if
err
!=
nil
{
glog
.
Errorf
(
err
.
Error
()
)
glog
.
Infof
(
"report error failed: %v"
,
err
)
}
fmt
.
Printf
(
"
\n\n
minikube failed :( exiting with error code %d
\n
"
,
returnCode
)
os
.
Exit
(
returnCode
)
}
...
...
@@ -181,6 +189,7 @@ func PromptUserForAccept(r io.Reader) bool {
return
false
}
case
<-
time
.
After
(
30
*
time
.
Second
)
:
fmt
.
Println
(
"Prompt timed out."
)
return
false
}
}
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
f29c0cd3
...
...
@@ -170,7 +170,7 @@ func (k *KubeadmBootstrapper) StartCluster(k8s config.KubernetesConfig) error {
out
,
err
:=
k
.
c
.
CombinedOutput
(
b
.
String
())
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"kubeadm init
error %s running command: %s
"
,
b
.
String
(),
out
)
return
errors
.
Wrapf
(
err
,
"kubeadm init
: %s
\n
%s
\n
"
,
b
.
String
(),
out
)
}
if
version
.
LT
(
semver
.
MustParse
(
"1.10.0-alpha.0"
))
{
...
...
pkg/minikube/bootstrapper/ssh_runner.go
浏览文件 @
f29c0cd3
...
...
@@ -145,7 +145,7 @@ func (s *SSHRunner) CombinedOutput(cmd string) (string, error) {
err
=
teeSSH
(
sess
,
cmd
,
&
combined
,
&
combined
)
out
:=
combined
.
b
.
String
()
if
err
!=
nil
{
return
""
,
err
return
out
,
err
}
return
out
,
nil
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录