Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
7a3f624b
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 搜索 >>
未验证
提交
7a3f624b
编写于
4月 20, 2020
作者:
M
Medya Ghazizadeh
提交者:
GitHub
4月 20, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7803 from priyawadhwa/ui
Improve minikube verifying UI
上级
31f7f0f6
4a414fa8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
10 deletion
+2
-10
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+1
-7
pkg/minikube/out/style.go
pkg/minikube/out/style.go
+1
-2
pkg/minikube/out/style_enum.go
pkg/minikube/out/style_enum.go
+0
-1
未找到文件。
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
7a3f624b
...
@@ -335,8 +335,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
...
@@ -335,8 +335,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
return
nil
return
nil
}
}
out
.
T
(
out
.
HealthCheck
,
"Verifying Kubernetes Components:"
)
out
.
T
(
out
.
HealthCheck
,
"Verifying Kubernetes components..."
)
out
.
T
(
out
.
IndentVerify
,
"verifying node conditions ..."
)
// TODO: #7706: for better performance we could use k.client inside minikube to avoid asking for external IP:PORT
// TODO: #7706: for better performance we could use k.client inside minikube to avoid asking for external IP:PORT
hostname
,
_
,
port
,
err
:=
driver
.
ControlPaneEndpoint
(
&
cfg
,
&
n
,
cfg
.
Driver
)
hostname
,
_
,
port
,
err
:=
driver
.
ControlPaneEndpoint
(
&
cfg
,
&
n
,
cfg
.
Driver
)
...
@@ -366,7 +365,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
...
@@ -366,7 +365,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
}
}
if
cfg
.
VerifyComponents
[
kverify
.
APIServerWaitKey
]
{
if
cfg
.
VerifyComponents
[
kverify
.
APIServerWaitKey
]
{
out
.
T
(
out
.
IndentVerify
,
"verifying api server ..."
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"get k8s client"
)
return
errors
.
Wrap
(
err
,
"get k8s client"
)
...
@@ -381,7 +379,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
...
@@ -381,7 +379,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
}
}
if
cfg
.
VerifyComponents
[
kverify
.
SystemPodsWaitKey
]
{
if
cfg
.
VerifyComponents
[
kverify
.
SystemPodsWaitKey
]
{
out
.
T
(
out
.
IndentVerify
,
"verifying system pods ..."
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"get k8s client"
)
return
errors
.
Wrap
(
err
,
"get k8s client"
)
...
@@ -392,7 +389,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
...
@@ -392,7 +389,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
}
}
if
cfg
.
VerifyComponents
[
kverify
.
DefaultSAWaitKey
]
{
if
cfg
.
VerifyComponents
[
kverify
.
DefaultSAWaitKey
]
{
out
.
T
(
out
.
IndentVerify
,
"verifying default service account ..."
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"get k8s client"
)
return
errors
.
Wrap
(
err
,
"get k8s client"
)
...
@@ -403,7 +399,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
...
@@ -403,7 +399,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
}
}
if
cfg
.
VerifyComponents
[
kverify
.
AppsRunningKey
]
{
if
cfg
.
VerifyComponents
[
kverify
.
AppsRunningKey
]
{
out
.
T
(
out
.
IndentVerify
,
"verifying apps running ..."
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"get k8s client"
)
return
errors
.
Wrap
(
err
,
"get k8s client"
)
...
@@ -414,7 +409,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
...
@@ -414,7 +409,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time
}
}
if
cfg
.
VerifyComponents
[
kverify
.
NodeReadyKey
]
{
if
cfg
.
VerifyComponents
[
kverify
.
NodeReadyKey
]
{
out
.
T
(
out
.
IndentVerify
,
"verifying node ready"
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
client
,
err
:=
k
.
client
(
hostname
,
port
)
if
err
!=
nil
{
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"get k8s client"
)
return
errors
.
Wrap
(
err
,
"get k8s client"
)
...
...
pkg/minikube/out/style.go
浏览文件 @
7a3f624b
...
@@ -70,7 +70,6 @@ var styles = map[StyleEnum]style{
...
@@ -70,7 +70,6 @@ var styles = map[StyleEnum]style{
ThumbsUp
:
{
Prefix
:
"👍 "
},
ThumbsUp
:
{
Prefix
:
"👍 "
},
ThumbsDown
:
{
Prefix
:
"👎 "
},
ThumbsDown
:
{
Prefix
:
"👎 "
},
Option
:
{
Prefix
:
" ▪ "
,
LowPrefix
:
lowIndent
},
// Indented bullet
Option
:
{
Prefix
:
" ▪ "
,
LowPrefix
:
lowIndent
},
// Indented bullet
IndentVerify
:
{
Prefix
:
" 🔎 "
,
LowPrefix
:
lowIndent
},
// Indented verifying icon, it needs extra space to make it work
Command
:
{
Prefix
:
" ▪ "
,
LowPrefix
:
lowIndent
},
// Indented bullet
Command
:
{
Prefix
:
" ▪ "
,
LowPrefix
:
lowIndent
},
// Indented bullet
LogEntry
:
{
Prefix
:
" "
},
// Indent
LogEntry
:
{
Prefix
:
" "
},
// Indent
Deleted
:
{
Prefix
:
"💀 "
},
Deleted
:
{
Prefix
:
"💀 "
},
...
@@ -109,7 +108,7 @@ var styles = map[StyleEnum]style{
...
@@ -109,7 +108,7 @@ var styles = map[StyleEnum]style{
Enabling
:
{
Prefix
:
"🔌 "
},
Enabling
:
{
Prefix
:
"🔌 "
},
Shutdown
:
{
Prefix
:
"🛑 "
},
Shutdown
:
{
Prefix
:
"🛑 "
},
Pulling
:
{
Prefix
:
"🚜 "
},
Pulling
:
{
Prefix
:
"🚜 "
},
HealthCheck
:
{
Prefix
:
"
🕵️ "
},
// mac needed extra space for right tabbing
HealthCheck
:
{
Prefix
:
"
🔎 "
},
Verifying
:
{
Prefix
:
"🤔 "
},
Verifying
:
{
Prefix
:
"🤔 "
},
VerifyingNoLine
:
{
Prefix
:
"🤔 "
,
OmitNewline
:
true
},
VerifyingNoLine
:
{
Prefix
:
"🤔 "
,
OmitNewline
:
true
},
Kubectl
:
{
Prefix
:
"💗 "
},
Kubectl
:
{
Prefix
:
"💗 "
},
...
...
pkg/minikube/out/style_enum.go
浏览文件 @
7a3f624b
...
@@ -43,7 +43,6 @@ const (
...
@@ -43,7 +43,6 @@ const (
ThumbsUp
ThumbsUp
ThumbsDown
ThumbsDown
Option
Option
IndentVerify
Command
Command
LogEntry
LogEntry
Deleted
Deleted
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录