k8s: include entity kind/name in kubectl timeout error message

When kubectl apply times out, the error now identifies which resource
timed out (e.g. "Deployment/my-app") instead of just reporting the
duration. Also fixes the timeout condition which was checking wgCtx
instead of the returned error, making the timeout error unreachable.

Fixes #3686

Signed-off-by: Brent Hiranaka <brenthiranaka95@gmail.com>

Author: breezy-devs

internal/k8s/client.go

@@ -313,8 +313,8 @@ func ServiceURL(service *v1.Service, ip NodeIP) (*url.URL, error) {
 	return nil, nil
 }
 
-func timeoutError(timeout time.Duration) error {
-	return errors.New(fmt.Sprintf("Killed kubectl. Hit timeout of %v.", timeout))
+func timeoutError(timeout time.Duration, entity K8sEntity) error {
+	return errors.New(fmt.Sprintf("Killed kubectl. Hit timeout of %v applying %s/%s.", timeout, entity.GVK().Kind, entity.Name()))
 }
 
 func (k *K8sClient) ToRESTConfig() (*rest.Config, error) {
@@ -378,8 +378,8 @@ func (k *K8sClient) upsertParallel(ctx context.Context, entities []K8sEntity, ti
 
 			newEntityList, err := k.escalatingUpdate(innerCtx, entity, ssa)
 			if err != nil {
-				if errors.Is(wgCtx.Err(), context.DeadlineExceeded) {
-					return timeoutError(timeout)
+				if errors.Is(err, context.DeadlineExceeded) {
+					return timeoutError(timeout, entity)
 				}
 				return err
 			}

internal/k8s/client_test.go

@@ -49,6 +49,13 @@ func TestNotEmptyNamespace(t *testing.T) {
 	assert.Equal(t, "x", ns.String())
 }
 
+func TestTimeoutErrorMessage(t *testing.T) {
+	entities := MustParseYAMLFromString(t, testyaml.SanchoYAML)
+	err := timeoutError(10*time.Second, entities[0])
+	assert.Contains(t, err.Error(), "10s")
+	assert.Contains(t, err.Error(), "Deployment/sancho")
+}
+
 func TestUpsert(t *testing.T) {
 	f := newClientTestFixture(t)
 	postgres, err := ParseYAMLFromString(testyaml.PostgresYAML)