Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
bb327e25
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,发现更多精彩内容 >>
提交
bb327e25
编写于
4月 16, 2020
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adjust try
上级
0d6713a8
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
7 addition
and
7 deletion
+7
-7
cmd/minikube/cmd/config/open.go
cmd/minikube/cmd/config/open.go
+0
-1
cmd/minikube/cmd/dashboard.go
cmd/minikube/cmd/dashboard.go
+3
-2
pkg/addons/addons.go
pkg/addons/addons.go
+1
-1
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+1
-1
pkg/provision/buildroot.go
pkg/provision/buildroot.go
+1
-1
pkg/provision/ubuntu.go
pkg/provision/ubuntu.go
+1
-1
未找到文件。
cmd/minikube/cmd/config/open.go
浏览文件 @
bb327e25
...
@@ -88,7 +88,6 @@ You can add one by annotating a service with the label {{.labelName}}:{{.addonNa
...
@@ -88,7 +88,6 @@ You can add one by annotating a service with the label {{.labelName}}:{{.addonNa
for
i
:=
range
serviceList
.
Items
{
for
i
:=
range
serviceList
.
Items
{
svc
:=
serviceList
.
Items
[
i
]
.
ObjectMeta
.
Name
svc
:=
serviceList
.
Items
[
i
]
.
ObjectMeta
.
Name
var
urlString
[]
string
var
urlString
[]
string
if
urlString
,
err
=
service
.
WaitForService
(
co
.
API
,
namespace
,
svc
,
addonsURLTemplate
,
addonsURLMode
,
https
,
wait
,
interval
);
err
!=
nil
{
if
urlString
,
err
=
service
.
WaitForService
(
co
.
API
,
namespace
,
svc
,
addonsURLTemplate
,
addonsURLMode
,
https
,
wait
,
interval
);
err
!=
nil
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"Wait failed: {{.error}}"
,
out
.
V
{
"error"
:
err
})
exit
.
WithCodeT
(
exit
.
Unavailable
,
"Wait failed: {{.error}}"
,
out
.
V
{
"error"
:
err
})
}
}
...
...
cmd/minikube/cmd/dashboard.go
浏览文件 @
bb327e25
...
@@ -84,7 +84,8 @@ var dashboardCmd = &cobra.Command{
...
@@ -84,7 +84,8 @@ var dashboardCmd = &cobra.Command{
svc
:=
"kubernetes-dashboard"
svc
:=
"kubernetes-dashboard"
out
.
ErrT
(
out
.
Verifying
,
"Verifying dashboard health ..."
)
out
.
ErrT
(
out
.
Verifying
,
"Verifying dashboard health ..."
)
checkSVC
:=
func
()
error
{
return
service
.
CheckService
(
ns
,
svc
)
}
checkSVC
:=
func
()
error
{
return
service
.
CheckService
(
ns
,
svc
)
}
if
err
=
retry
.
Expo
(
checkSVC
,
1
*
time
.
Second
,
time
.
Minute
*
5
);
err
!=
nil
{
// for slow machines or parallels in CI to avoid #7503
if
err
=
retry
.
Expo
(
checkSVC
,
100
*
time
.
Microsecond
,
time
.
Minute
*
10
);
err
!=
nil
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"dashboard service is not running: {{.error}}"
,
out
.
V
{
"error"
:
err
})
exit
.
WithCodeT
(
exit
.
Unavailable
,
"dashboard service is not running: {{.error}}"
,
out
.
V
{
"error"
:
err
})
}
}
...
@@ -97,7 +98,7 @@ var dashboardCmd = &cobra.Command{
...
@@ -97,7 +98,7 @@ var dashboardCmd = &cobra.Command{
out
.
ErrT
(
out
.
Verifying
,
"Verifying proxy health ..."
)
out
.
ErrT
(
out
.
Verifying
,
"Verifying proxy health ..."
)
chkURL
:=
func
()
error
{
return
checkURL
(
url
)
}
chkURL
:=
func
()
error
{
return
checkURL
(
url
)
}
if
err
=
retry
.
Expo
(
chkURL
,
1
*
time
.
Second
,
3
*
time
.
Minute
);
err
!=
nil
{
if
err
=
retry
.
Expo
(
chkURL
,
1
00
*
time
.
Microsecond
,
10
*
time
.
Minute
);
err
!=
nil
{
exit
.
WithCodeT
(
exit
.
Unavailable
,
"{{.url}} is not accessible: {{.error}}"
,
out
.
V
{
"url"
:
url
,
"error"
:
err
})
exit
.
WithCodeT
(
exit
.
Unavailable
,
"{{.url}} is not accessible: {{.error}}"
,
out
.
V
{
"url"
:
url
,
"error"
:
err
})
}
}
...
...
pkg/addons/addons.go
浏览文件 @
bb327e25
...
@@ -244,7 +244,7 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon,
...
@@ -244,7 +244,7 @@ func enableOrDisableAddonInternal(cc *config.ClusterConfig, addon *assets.Addon,
return
err
return
err
}
}
return
retry
.
Expo
(
apply
,
1
*
time
.
Second
,
time
.
Second
*
30
)
return
retry
.
Expo
(
apply
,
1
00
*
time
.
Microsecond
,
time
.
Minute
)
}
}
// enableOrDisableStorageClasses enables or disables storage classes
// enableOrDisableStorageClasses enables or disables storage classes
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
bb327e25
...
@@ -522,7 +522,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
...
@@ -522,7 +522,7 @@ func (k *Bootstrapper) restartCluster(cfg config.ClusterConfig) error {
_
,
err
:=
k
.
c
.
RunCmd
(
exec
.
Command
(
"/bin/bash"
,
"-c"
,
fmt
.
Sprintf
(
"%s phase addon all --config %s"
,
baseCmd
,
conf
)))
_
,
err
:=
k
.
c
.
RunCmd
(
exec
.
Command
(
"/bin/bash"
,
"-c"
,
fmt
.
Sprintf
(
"%s phase addon all --config %s"
,
baseCmd
,
conf
)))
return
err
return
err
}
}
if
err
=
retry
.
Expo
(
addonPhase
,
1
*
time
.
S
econd
,
30
*
time
.
Second
);
err
!=
nil
{
if
err
=
retry
.
Expo
(
addonPhase
,
1
00
*
time
.
Micros
econd
,
30
*
time
.
Second
);
err
!=
nil
{
glog
.
Warningf
(
"addon install failed, wil retry: %v"
,
err
)
glog
.
Warningf
(
"addon install failed, wil retry: %v"
,
err
)
return
errors
.
Wrap
(
err
,
"addons"
)
return
errors
.
Wrap
(
err
,
"addons"
)
}
}
...
...
pkg/provision/buildroot.go
浏览文件 @
bb327e25
...
@@ -177,7 +177,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
...
@@ -177,7 +177,7 @@ func (p *BuildrootProvisioner) Provision(swarmOptions swarm.Options, authOptions
return
nil
return
nil
}
}
err
:=
retry
.
Expo
(
configAuth
,
time
.
S
econd
,
2
*
time
.
Minute
)
err
:=
retry
.
Expo
(
configAuth
,
100
*
time
.
Micros
econd
,
2
*
time
.
Minute
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Infof
(
"Error configuring auth during provisioning %v"
,
err
)
glog
.
Infof
(
"Error configuring auth during provisioning %v"
,
err
)
return
err
return
err
...
...
pkg/provision/ubuntu.go
浏览文件 @
bb327e25
...
@@ -180,7 +180,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
...
@@ -180,7 +180,7 @@ func (p *UbuntuProvisioner) Provision(swarmOptions swarm.Options, authOptions au
return
nil
return
nil
}
}
err
:=
retry
.
Expo
(
configAuth
,
time
.
S
econd
,
2
*
time
.
Minute
)
err
:=
retry
.
Expo
(
configAuth
,
100
*
time
.
Micros
econd
,
2
*
time
.
Minute
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Infof
(
"Error configuring auth during provisioning %v"
,
err
)
glog
.
Infof
(
"Error configuring auth during provisioning %v"
,
err
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录