spanconfig: capture context error in reconciliation job resumer

The retrier can break on a context cancellation which is not propagated
out. This change captures those errors and exposes that context error.

Epic: none
Fixes: #167061

Release note: None

Author: bghal

pkg/spanconfig/spanconfigjob/job.go

@@ -195,8 +195,8 @@ func (r *resumer) Resume(ctx context.Context, execCtxI interface{}) (jobErr erro
 		return nil // we're done here (the stopper was stopped, Reconcile exited cleanly)
 	}
 
-	if lastErr != nil {
-		return errors.Wrap(lastErr, "reconciliation unsuccessful, failing job")
+	if err := errors.CombineErrors(lastErr, ctx.Err()); err != nil {
+		return errors.Wrap(err, "reconciliation unsuccessful, failing job")
 	}
 	return errors.Newf("reconciliation unsuccessful, failing job")
 }