From fda014a8a5a52d83fdb27a64cd24e0ebd8439017 Mon Sep 17 00:00:00 2001 From: gsquared94 Date: Tue, 5 May 2020 12:22:37 -0700 Subject: [PATCH 1/4] Show message "Press ctrl c to exit" on forward manager start --- pkg/skaffold/kubernetes/portforward/forwarder_manager.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/skaffold/kubernetes/portforward/forwarder_manager.go b/pkg/skaffold/kubernetes/portforward/forwarder_manager.go index d876f56d963..8fb3d78be5b 100644 --- a/pkg/skaffold/kubernetes/portforward/forwarder_manager.go +++ b/pkg/skaffold/kubernetes/portforward/forwarder_manager.go @@ -20,6 +20,7 @@ import ( "context" "io" + "github.com/GoogleContainerTools/skaffold/pkg/skaffold/color" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/config" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes" @@ -72,6 +73,8 @@ func (p *ForwarderManager) Start(ctx context.Context) error { return err } } + + color.Yellow.Fprintln(p.output, "Press ctrl c to exit") return nil } From d0175e4288f4a4a6c1be8fa17a55a8e507ab170c Mon Sep 17 00:00:00 2001 From: gsquared94 Date: Tue, 5 May 2020 14:21:42 -0700 Subject: [PATCH 2/4] Move message to only for port-fordwarding. --- pkg/skaffold/kubernetes/portforward/forwarder_manager.go | 3 --- pkg/skaffold/runner/build_deploy.go | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/skaffold/kubernetes/portforward/forwarder_manager.go b/pkg/skaffold/kubernetes/portforward/forwarder_manager.go index 8fb3d78be5b..d876f56d963 100644 --- a/pkg/skaffold/kubernetes/portforward/forwarder_manager.go +++ b/pkg/skaffold/kubernetes/portforward/forwarder_manager.go @@ -20,7 +20,6 @@ import ( "context" "io" - "github.com/GoogleContainerTools/skaffold/pkg/skaffold/color" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/config" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl" "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes" @@ -73,8 +72,6 @@ func (p *ForwarderManager) Start(ctx context.Context) error { return err } } - - color.Yellow.Fprintln(p.output, "Press ctrl c to exit") return nil } diff --git a/pkg/skaffold/runner/build_deploy.go b/pkg/skaffold/runner/build_deploy.go index 19a6ae29b47..e8c391b54e5 100644 --- a/pkg/skaffold/runner/build_deploy.go +++ b/pkg/skaffold/runner/build_deploy.go @@ -118,6 +118,8 @@ func (r *SkaffoldRunner) DeployAndLog(ctx context.Context, out io.Writer, artifa if err := r.forwarderManager.Start(ctx); err != nil { logrus.Warnln("Error starting port forwarding:", err) } + + color.Yellow.Fprintln(out, "Press ctrl c to exit") } // Start printing the logs after deploy is finished From a05fee49c52d756d6a8905146fd79baf48aeb340 Mon Sep 17 00:00:00 2001 From: gsquared94 Date: Tue, 5 May 2020 14:24:20 -0700 Subject: [PATCH 3/4] Don't print if port forwarding errors out --- pkg/skaffold/runner/build_deploy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/skaffold/runner/build_deploy.go b/pkg/skaffold/runner/build_deploy.go index e8c391b54e5..e3de2dd5bc4 100644 --- a/pkg/skaffold/runner/build_deploy.go +++ b/pkg/skaffold/runner/build_deploy.go @@ -117,9 +117,9 @@ func (r *SkaffoldRunner) DeployAndLog(ctx context.Context, out io.Writer, artifa if r.runCtx.Opts.PortForward.Enabled { if err := r.forwarderManager.Start(ctx); err != nil { logrus.Warnln("Error starting port forwarding:", err) + } else { + color.Yellow.Fprintln(out, "Press ctrl c to exit") } - - color.Yellow.Fprintln(out, "Press ctrl c to exit") } // Start printing the logs after deploy is finished From b5fb3226aa58eab19e5a9c0b93850446202a7015 Mon Sep 17 00:00:00 2001 From: Gaurav <39389231+gsquared94@users.noreply.github.com> Date: Wed, 6 May 2020 21:00:48 -0700 Subject: [PATCH 4/4] Change text --- pkg/skaffold/runner/build_deploy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/skaffold/runner/build_deploy.go b/pkg/skaffold/runner/build_deploy.go index e3de2dd5bc4..5fb331d8383 100644 --- a/pkg/skaffold/runner/build_deploy.go +++ b/pkg/skaffold/runner/build_deploy.go @@ -118,7 +118,7 @@ func (r *SkaffoldRunner) DeployAndLog(ctx context.Context, out io.Writer, artifa if err := r.forwarderManager.Start(ctx); err != nil { logrus.Warnln("Error starting port forwarding:", err) } else { - color.Yellow.Fprintln(out, "Press ctrl c to exit") + color.Yellow.Fprintln(out, "Press Ctrl+C to exit") } }