diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 07f8dfb5c5..e5aa46acc7 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -335,8 +335,7 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time return nil } - out.T(out.HealthCheck, "Verifying Kubernetes Components:") - out.T(out.IndentVerify, "verifying node conditions ...") + out.T(out.HealthCheck, "Verifying Kubernetes components...") // 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) @@ -366,7 +365,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.APIServerWaitKey] { - out.T(out.IndentVerify, "verifying api server ...") client, err := k.client(hostname, port) if err != nil { return errors.Wrap(err, "get k8s client") @@ -381,7 +379,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.SystemPodsWaitKey] { - out.T(out.IndentVerify, "verifying system pods ...") client, err := k.client(hostname, port) if err != nil { return errors.Wrap(err, "get k8s client") @@ -392,7 +389,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.DefaultSAWaitKey] { - out.T(out.IndentVerify, "verifying default service account ...") client, err := k.client(hostname, port) if err != nil { return errors.Wrap(err, "get k8s client") @@ -403,7 +399,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.AppsRunningKey] { - out.T(out.IndentVerify, "verifying apps running ...") client, err := k.client(hostname, port) if err != nil { return errors.Wrap(err, "get k8s client") @@ -414,7 +409,6 @@ func (k *Bootstrapper) WaitForNode(cfg config.ClusterConfig, n config.Node, time } if cfg.VerifyComponents[kverify.NodeReadyKey] { - out.T(out.IndentVerify, "verifying node ready") client, err := k.client(hostname, port) if err != nil { return errors.Wrap(err, "get k8s client") diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go index 29629db191..349b8c4e3f 100644 --- a/pkg/minikube/out/style.go +++ b/pkg/minikube/out/style.go @@ -70,7 +70,6 @@ var styles = map[StyleEnum]style{ ThumbsUp: {Prefix: "👍 "}, ThumbsDown: {Prefix: "👎 "}, 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 LogEntry: {Prefix: " "}, // Indent Deleted: {Prefix: "💀 "}, @@ -109,7 +108,7 @@ var styles = map[StyleEnum]style{ Enabling: {Prefix: "🔌 "}, Shutdown: {Prefix: "🛑 "}, Pulling: {Prefix: "🚜 "}, - HealthCheck: {Prefix: "🕵️ "}, // mac needed extra space for right tabbing + HealthCheck: {Prefix: "🔎 "}, Verifying: {Prefix: "🤔 "}, VerifyingNoLine: {Prefix: "🤔 ", OmitNewline: true}, Kubectl: {Prefix: "💗 "}, diff --git a/pkg/minikube/out/style_enum.go b/pkg/minikube/out/style_enum.go index e47ec25722..fd28a00f3f 100644 --- a/pkg/minikube/out/style_enum.go +++ b/pkg/minikube/out/style_enum.go @@ -43,7 +43,6 @@ const ( ThumbsUp ThumbsDown Option - IndentVerify Command LogEntry Deleted