diff --git a/cmd/minikube/cmd/config/profile_list.go b/cmd/minikube/cmd/config/profile_list.go index a0e690e098..7a03084ec1 100644 --- a/cmd/minikube/cmd/config/profile_list.go +++ b/cmd/minikube/cmd/config/profile_list.go @@ -91,7 +91,7 @@ var printProfilesTable = func() { table.Render() if invalidProfiles != nil { - out.T(out.WarningType, "Found {{.number}} invalid profile(s) ! ", out.V{"number": len(invalidProfiles)}) + out.T(out.Warning, "Found {{.number}} invalid profile(s) ! ", out.V{"number": len(invalidProfiles)}) for _, p := range invalidProfiles { out.T(out.Empty, "\t "+p.Name) } diff --git a/cmd/minikube/cmd/config/validations.go b/cmd/minikube/cmd/config/validations.go index 60ec6a53ab..8f57e13c45 100644 --- a/cmd/minikube/cmd/config/validations.go +++ b/cmd/minikube/cmd/config/validations.go @@ -40,7 +40,7 @@ func IsValidDriver(string, name string) error { // RequiresRestartMsg returns the "requires restart" message func RequiresRestartMsg(string, string) error { - out.T(out.WarningType, "These changes will take effect upon a minikube delete and then a minikube start") + out.T(out.Warning, "These changes will take effect upon a minikube delete and then a minikube start") return nil } diff --git a/cmd/minikube/cmd/mount.go b/cmd/minikube/cmd/mount.go index 228e87b49c..46ea74b524 100644 --- a/cmd/minikube/cmd/mount.go +++ b/cmd/minikube/cmd/mount.go @@ -159,7 +159,7 @@ var mountCmd = &cobra.Command{ // An escape valve to allow future hackers to try NFS, VirtFS, or other FS types. if !supportedFilesystems[cfg.Type] { - out.T(out.WarningType, "{{.type}} is not yet a supported filesystem. We will try anyways!", out.V{"type": cfg.Type}) + out.T(out.Warning, "{{.type}} is not yet a supported filesystem. We will try anyways!", out.V{"type": cfg.Type}) } bindIP := ip.String() // the ip to listen on the user's host machine diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index 55cac11512..174e1b88c9 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -151,7 +151,7 @@ func startKicServiceTunnel(svc, configName string) { service.PrintServiceList(os.Stdout, data) openURLs(svc, urls) - out.T(out.WarningType, "Because you are using docker driver on Mac, the terminal needs to be open to run it.") + out.T(out.Warning, "Because you are using docker driver on Mac, the terminal needs to be open to run it.") <-ctrlC diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go index b885e6e1b9..e6d131c7e4 100644 --- a/cmd/minikube/cmd/stop.go +++ b/cmd/minikube/cmd/stop.go @@ -67,7 +67,7 @@ func runStop(cmd *cobra.Command, args []string) { } if err := killMountProcess(); err != nil { - out.T(out.WarningType, "Unable to kill mount process: {{.error}}", out.V{"error": err}) + out.T(out.Warning, "Unable to kill mount process: {{.error}}", out.V{"error": err}) } err = kubeconfig.UnsetCurrentContext(profile, kubeconfig.PathFromEnv()) diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go index 674ee34473..248a84697d 100644 --- a/pkg/minikube/machine/fix.go +++ b/pkg/minikube/machine/fix.go @@ -162,7 +162,7 @@ func maybeWarnAboutEvalEnv(drver string, name string) { return } out.T(out.Notice, "Noticed that you are using minikube docker-env:") - out.T(out.WarningType, `After minikube restart the dockerd ports might have changed. To ensure docker-env works properly. + out.T(out.Warning, `After minikube restart the dockerd ports might have changed. To ensure docker-env works properly. Please re-eval the docker-env command: 'minikube -p {{.profile_name}} docker-env' diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go index 8fd1542c3d..9ecb23c053 100644 --- a/pkg/minikube/out/out.go +++ b/pkg/minikube/out/out.go @@ -118,7 +118,7 @@ func FatalT(format string, a ...V) { // WarningT is a shortcut for writing a templated warning message to stderr func WarningT(format string, a ...V) { - ErrT(WarningType, format, a...) + ErrT(Warning, format, a...) } // FailureT is a shortcut for writing a templated failure message to stderr diff --git a/pkg/minikube/out/out_test.go b/pkg/minikube/out/out_test.go index c364b58119..dee4e4ca51 100644 --- a/pkg/minikube/out/out_test.go +++ b/pkg/minikube/out/out_test.go @@ -44,7 +44,7 @@ func TestOutT(t *testing.T) { }{ {Happy, "Happy", nil, "😄 Happy\n", "* Happy\n"}, {Option, "Option", nil, " ▪ Option\n", " - Option\n"}, - {WarningType, "Warning", nil, "⚠️ Warning\n", "! Warning\n"}, + {Warning, "Warning", nil, "❗ Warning\n", "! Warning\n"}, {FatalType, "Fatal: {{.error}}", V{"error": "ugh"}, "💣 Fatal: ugh\n", "X Fatal: ugh\n"}, {Issue, "http://i/{{.number}}", V{"number": 10000}, " ▪ http://i/10000\n", " - http://i/10000\n"}, {Usage, "raw: {{.one}} {{.two}}", V{"one": "'%'", "two": "%d"}, "💡 raw: '%' %d\n", "* raw: '%' %d\n"}, diff --git a/pkg/minikube/out/style.go b/pkg/minikube/out/style.go index 8ddb52d634..8154f46980 100644 --- a/pkg/minikube/out/style.go +++ b/pkg/minikube/out/style.go @@ -63,7 +63,7 @@ var styles = map[StyleEnum]style{ Reconfiguring: {Prefix: "📯 "}, Stopping: {Prefix: "✋ "}, Stopped: {Prefix: "🛑 "}, - WarningType: {Prefix: "❗ ", LowPrefix: lowWarning}, + Warning: {Prefix: "❗ ", LowPrefix: lowWarning}, Waiting: {Prefix: "⌛ "}, Usage: {Prefix: "💡 "}, Launch: {Prefix: "🚀 "}, diff --git a/pkg/minikube/out/style_enum.go b/pkg/minikube/out/style_enum.go index 5b1571a042..d5937e2383 100644 --- a/pkg/minikube/out/style_enum.go +++ b/pkg/minikube/out/style_enum.go @@ -35,7 +35,7 @@ const ( Reconfiguring Stopping Stopped - WarningType + Warning Waiting WaitingPods Usage diff --git a/pkg/minikube/tunnel/kic/ssh_conn.go b/pkg/minikube/tunnel/kic/ssh_conn.go index bedb2cd473..9c0135ea60 100644 --- a/pkg/minikube/tunnel/kic/ssh_conn.go +++ b/pkg/minikube/tunnel/kic/ssh_conn.go @@ -68,7 +68,7 @@ func createSSHConn(name, sshPort, sshKey string, svc *v1.Service) *sshConn { if askForSudo { out.T( - out.WarningType, + out.Warning, "The service {{.service}} requires privileged ports to be exposed: {{.ports}}", out.V{"service": svc.Name, "ports": fmt.Sprintf("%v", privilegedPorts)}, )