[docs] [output] meaningful message for healthcheck context exceeded. (#3177)

* meaningful message

* do not use errors.Unwrap since its in 1.13 go errors

Author: tejal29

pkg/skaffold/deploy/resource/deployment.go

@@ -18,10 +18,12 @@ package resource
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"strings"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 )
@@ -34,7 +36,7 @@ const (
 )
 
 var (
-	errKubectlKilled     = errors.New("kubectl rollout status command killed")
+	errKubectlKilled     = errors.New("kubectl rollout status command interrupted")
 	ErrKubectlConnection = errors.New("kubectl connection error")
 )
 
@@ -74,6 +76,9 @@ func (d *Deployment) CheckStatus(ctx context.Context, runCtx *runcontext.RunCont
 	b, err := kubeCtl.RunOut(ctx, "rollout", "status", "deployment", d.name, "--namespace", d.namespace, "--watch=false")
 	details := string(b)
 	err = parseKubectlRolloutError(err)
+	if err == errKubectlKilled {
+		err = errors.Wrap(err, fmt.Sprintf("received Ctrl-C or deployments could not stabilize within %v", d.deadline))
+	}
 	d.UpdateStatus(details, err)
 }
 

pkg/skaffold/deploy/status_check.go

@@ -125,7 +125,8 @@ func pollResourceStatus(ctx context.Context, runCtx *runcontext.RunContext, r Re
 	for {
 		select {
 		case <-timeoutContext.Done():
-			r.UpdateStatus(timeoutContext.Err().Error(), timeoutContext.Err())
+			err := errors.Wrap(timeoutContext.Err(), fmt.Sprintf("could not stabilize within %v", r.Deadline()))
+			r.UpdateStatus(err.Error(), err)
 			return
 		case <-time.After(pollDuration):
 			r.CheckStatus(timeoutContext, runCtx)

pkg/skaffold/deploy/status_check_test.go

@@ -19,11 +19,11 @@ package deploy
 import (
 	"bytes"
 	"context"
-	"errors"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -208,6 +208,7 @@ type mockResource struct {
 }
 
 func (m *mockResource) UpdateStatus(s string, err error) {
+	err = errors.Cause(err)
 	if err == context.DeadlineExceeded {
 		m.inErr = true
 	}
@@ -244,7 +245,7 @@ func TestPollResourceStatus(t *testing.T) {
 		testutil.Run(t, test.description, func(t *testutil.T) {
 			t.Override(&defaultPollPeriodInMilliseconds, 0)
 			pollResourceStatus(context.Background(), nil, test.dummyResource)
-			t.CheckDeepEqual(test.dummyResource.inErr, test.isInErr)
+			t.CheckDeepEqual(test.isInErr, test.dummyResource.inErr)
 		})
 	}
 }