diff --git a/pkg/kube/statuswait.go b/pkg/kube/statuswait.go index a0378aaf5..534aece8d 100644 --- a/pkg/kube/statuswait.go +++ b/pkg/kube/statuswait.go @@ -40,24 +40,25 @@ type statusWaiter struct { func (w *statusWaiter) Wait(resourceList ResourceList, timeout time.Duration) error { ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() + w.log("beginning wait for %d resources with timeout of %s", len(resourceList), timeout) return w.wait(ctx, resourceList, false) } func (w *statusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Duration) error { ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() + w.log("beginning wait for %d resources with timeout of %s", len(resourceList), timeout) return w.wait(ctx, resourceList, true) } func (w *statusWaiter) WaitForDelete(resourceList ResourceList, timeout time.Duration) error { ctx, cancel := context.WithTimeout(context.TODO(), timeout) defer cancel() + w.log("beginning wait for %d resources to be deleted with timeout of %s", len(resourceList), timeout) return w.waitForDelete(ctx, resourceList) } func (w *statusWaiter) waitForDelete(ctx context.Context, resourceList ResourceList) error { - deadline, _ := ctx.Deadline() - w.log("beginning wait for %d resources to be deleted with timeout of %v", len(resourceList), time.Until(deadline)) cancelCtx, cancel := context.WithCancel(ctx) defer cancel() resources := []object.ObjMetadata{} @@ -94,9 +95,7 @@ func (w *statusWaiter) waitForDelete(ctx context.Context, resourceList ResourceL return nil } -func (w *statusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error { - deadline, _ := ctx.Deadline() - w.log("beginning wait for %d resources with timeout of %v", len(resourceList), deadline) +func (w *statusWaiter) wait(ctx context.Context, resourceList ResourceList, waitForJobs bool) error { cancelCtx, cancel := context.WithCancel(ctx) defer cancel() resources := []object.ObjMetadata{}