未验证 提交 7a3f624b 编写于 作者: M Medya Ghazizadeh 提交者: GitHub

Merge pull request #7803 from priyawadhwa/ui

Improve minikube verifying UI
...@@ -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")
......
...@@ -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: "💗 "},
......
...@@ -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.
先完成此消息的编辑!
想要评论请 注册