Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
05a32799
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 搜索 >>
提交
05a32799
编写于
9月 12, 2019
作者:
T
Thomas Stromberg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add more logging for solving tricky bugs
上级
ad9debae
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
13 deletion
+14
-13
hack/jenkins/common.sh
hack/jenkins/common.sh
+1
-0
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+1
-1
pkg/minikube/cluster/cluster.go
pkg/minikube/cluster/cluster.go
+8
-8
test/integration/addons_test.go
test/integration/addons_test.go
+1
-1
test/integration/version_upgrade_test.go
test/integration/version_upgrade_test.go
+3
-3
未找到文件。
hack/jenkins/common.sh
浏览文件 @
05a32799
...
...
@@ -275,6 +275,7 @@ echo ""
echo
">> Starting
${
E2E_BIN
}
at
$(
date
)
"
${
SUDO_PREFIX
}${
E2E_BIN
}
\
-minikube-start-args
=
"--vm-driver=
${
VM_DRIVER
}
${
EXTRA_START_ARGS
}
"
\
-test
.v
\
-test
.timeout
=
60m
\
-test
.parallel
=
${
PARALLEL_COUNT
}
\
-binary
=
"
${
MINIKUBE_BIN
}
"
&&
result
=
$?
||
result
=
$?
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
05a32799
...
...
@@ -404,7 +404,7 @@ func (k *Bootstrapper) RestartCluster(k8s config.KubernetesConfig) error {
glog
.
Errorf
(
"failed to create compat symlinks: %v"
,
err
)
}
baseCmd
:=
fmt
.
Sprintf
(
"%s %s"
,
invokeKubeadm
(
k8s
.
KubernetesVersion
),
phase
)
baseCmd
:=
fmt
.
Sprintf
(
"%s
--alsologtostderr -v=1
%s"
,
invokeKubeadm
(
k8s
.
KubernetesVersion
),
phase
)
cmds
:=
[]
string
{
fmt
.
Sprintf
(
"%s phase certs all --config %s"
,
baseCmd
,
yamlConfigPath
),
fmt
.
Sprintf
(
"%s phase kubeconfig all --config %s"
,
baseCmd
,
yamlConfigPath
),
...
...
pkg/minikube/cluster/cluster.go
浏览文件 @
05a32799
...
...
@@ -166,15 +166,15 @@ func configureHost(h *host.Host, e *engine.Options) error {
}
}
if
!
localDriver
(
h
.
Driver
.
DriverName
())
{
glog
.
Infof
(
"Configuring auth for driver %s ..."
,
h
.
Driver
.
DriverName
())
if
err
:=
h
.
ConfigureAuth
();
err
!=
nil
{
return
&
retry
.
RetriableError
{
Err
:
errors
.
Wrap
(
err
,
"Error configuring auth on host"
)}
}
return
ensureSyncedGuestClock
(
h
)
if
localDriver
(
h
.
Driver
.
DriverName
())
{
glog
.
Infof
(
"%s is a local driver, skipping auth/time setup"
,
h
.
Driver
.
DriverName
())
return
nil
}
return
nil
glog
.
Infof
(
"Configuring auth for driver %s ..."
,
h
.
Driver
.
DriverName
())
if
err
:=
h
.
ConfigureAuth
();
err
!=
nil
{
return
&
retry
.
RetriableError
{
Err
:
errors
.
Wrap
(
err
,
"Error configuring auth on host"
)}
}
return
ensureSyncedGuestClock
(
h
)
}
// ensureGuestClockSync ensures that the guest system clock is relatively in-sync
...
...
test/integration/addons_test.go
浏览文件 @
05a32799
...
...
@@ -42,7 +42,7 @@ func TestAddons(t *testing.T) {
ctx
,
cancel
:=
context
.
WithTimeout
(
context
.
Background
(),
40
*
time
.
Minute
)
defer
CleanupWithLogs
(
t
,
profile
,
cancel
)
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
"--wait=false"
,
"--memory=2600"
},
StartArgs
()
...
)
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
"--wait=false"
,
"--memory=2600"
,
"--alsologtostderr"
,
"-v=1"
},
StartArgs
()
...
)
rr
,
err
:=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
args
...
))
if
err
!=
nil
{
t
.
Fatalf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
...
...
test/integration/version_upgrade_test.go
浏览文件 @
05a32799
...
...
@@ -63,7 +63,7 @@ func TestVersionUpgrade(t *testing.T) {
}
}
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
OldestKubernetesVersion
)},
StartArgs
()
...
)
args
:=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
OldestKubernetesVersion
)
,
"--alsologtostderr"
,
"-v=1"
},
StartArgs
()
...
)
rr
:=
&
RunResult
{}
releaseStart
:=
func
()
error
{
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
tf
.
Name
(),
args
...
))
...
...
@@ -71,7 +71,7 @@ func TestVersionUpgrade(t *testing.T) {
}
// Retry to allow flakiness for the previous release
if
err
:=
retry
.
Expo
(
releaseStart
,
1
*
time
.
Second
,
20
*
time
.
Minute
);
err
!=
nil
{
if
err
:=
retry
.
Expo
(
releaseStart
,
1
*
time
.
Second
,
30
*
time
.
Minute
,
3
);
err
!=
nil
{
t
.
Fatalf
(
"release start failed: %v"
,
err
)
}
...
...
@@ -89,7 +89,7 @@ func TestVersionUpgrade(t *testing.T) {
t
.
Errorf
(
"status = %q; want = %q"
,
got
,
state
.
Stopped
.
String
())
}
args
=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
NewestKubernetesVersion
)},
StartArgs
()
...
)
args
=
append
([]
string
{
"start"
,
"-p"
,
profile
,
fmt
.
Sprintf
(
"--kubernetes-version=%s"
,
constants
.
NewestKubernetesVersion
)
,
"--alsologtostderr"
,
"-v=2"
},
StartArgs
()
...
)
rr
,
err
=
Run
(
t
,
exec
.
CommandContext
(
ctx
,
Target
(),
args
...
))
if
err
!=
nil
{
t
.
Errorf
(
"%s failed: %v"
,
rr
.
Args
,
err
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录