提交 45e9cfba 编写于 作者: T tstromberg

Opt for shorter output strings

上级 4b9402fc
...@@ -239,7 +239,7 @@ func platform() string { ...@@ -239,7 +239,7 @@ func platform() string {
func runStart(cmd *cobra.Command, args []string) { func runStart(cmd *cobra.Command, args []string) {
prefix := "" prefix := ""
if viper.GetString(cfg.MachineProfile) != constants.DefaultMachineName { if viper.GetString(cfg.MachineProfile) != constants.DefaultMachineName {
prefix = fmt.Sprintf("[%s]", viper.GetString(cfg.MachineProfile)) prefix = fmt.Sprintf("[%s] ", viper.GetString(cfg.MachineProfile))
} }
out.T(out.Happy, "{{.prefix}}minikube {{.version}} on {{.platform}}", out.V{"prefix": prefix, "version": version.GetVersion(), "platform": platform()}) out.T(out.Happy, "{{.prefix}}minikube {{.version}} on {{.platform}}", out.V{"prefix": prefix, "version": version.GetVersion(), "platform": platform()})
...@@ -771,7 +771,7 @@ func validateKubernetesVersions(old *cfg.Config) (string, bool) { ...@@ -771,7 +771,7 @@ func validateKubernetesVersions(old *cfg.Config) (string, bool) {
return nv, isUpgrade return nv, isUpgrade
} }
if nvs.GT(ovs) { if nvs.GT(ovs) {
out.T(out.ThumbsUp, "minikube will upgrade the local cluster from Kubernetes {{.old}} to {{.new}}", out.V{"old": ovs, "new": nvs}) out.T(out.ThumbsUp, "Upgrading from Kubernetes {{.old}} to {{.new}}", out.V{"old": ovs, "new": nvs})
isUpgrade = true isUpgrade = true
} }
return nv, isUpgrade return nv, isUpgrade
......
...@@ -305,7 +305,7 @@ func (k *Bootstrapper) WaitCluster(k8s config.KubernetesConfig) error { ...@@ -305,7 +305,7 @@ func (k *Bootstrapper) WaitCluster(k8s config.KubernetesConfig) error {
// by a CNI plugin which is usually started after minikube has been brought // by a CNI plugin which is usually started after minikube has been brought
// up. Otherwise, minikube won't start, as "k8s-app" pods are not ready. // up. Otherwise, minikube won't start, as "k8s-app" pods are not ready.
componentsOnly := k8s.NetworkPlugin == "cni" componentsOnly := k8s.NetworkPlugin == "cni"
out.T(out.WaitingPods, "Verifying:") out.T(out.WaitingPods, "Waiting for pods:")
client, err := util.GetClient() client, err := util.GetClient()
if err != nil { if err != nil {
return errors.Wrap(err, "k8s client") return errors.Wrap(err, "k8s client")
......
...@@ -120,9 +120,9 @@ func StartHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error) ...@@ -120,9 +120,9 @@ func StartHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error)
} }
if s == state.Running { if s == state.Running {
out.T(out.Running, `Re-using the currently running {{.driver_name}} VM for "{{.profile_name}}" ...`, out.V{"driver_name": h.Driver.DriverName(), "profile_name": cfg.GetMachineName()}) out.T(out.Running, `Using the running {{.driver_name}} "{{.profile_name}}" VM ...`, out.V{"driver_name": h.Driver.DriverName(), "profile_name": cfg.GetMachineName()})
} else { } else {
out.T(out.Restarting, `Restarting existing {{.driver_name}} VM for "{{.profile_name}}" ...`, out.V{"driver_name": h.Driver.DriverName(), "profile_name": cfg.GetMachineName()}) out.T(out.Restarting, `Starting existing {{.driver_name}} VM for "{{.profile_name}}" ...`, out.V{"driver_name": h.Driver.DriverName(), "profile_name": cfg.GetMachineName()})
if err := h.Driver.Start(); err != nil { if err := h.Driver.Start(); err != nil {
return nil, errors.Wrap(err, "start") return nil, errors.Wrap(err, "start")
} }
...@@ -152,8 +152,7 @@ func localDriver(name string) bool { ...@@ -152,8 +152,7 @@ func localDriver(name string) bool {
// configureHost handles any post-powerup configuration required // configureHost handles any post-powerup configuration required
func configureHost(h *host.Host, e *engine.Options) error { func configureHost(h *host.Host, e *engine.Options) error {
glog.Infof("configureHost: %T %+v", h, h) glog.Infof("configureHost: %T %+v", h, h)
// Slightly counter-intuitive, but this is what DetectProvisioner & ConfigureAuth block on. out.T(out.Waiting, "Provisioning guest ...", out.V{})
out.T(out.Waiting, "Waiting for SSH access ...", out.V{})
if len(e.Env) > 0 { if len(e.Env) > 0 {
h.HostOptions.EngineOptions.Env = e.Env h.HostOptions.EngineOptions.Env = e.Env
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册