From b8128cf58b000844c8dde92aab309b97a4c6698a Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Wed, 2 Jun 2021 14:21:29 +0300 Subject: [PATCH] Reinstate Git cloning timeout Signed-off-by: Stefan Prodan --- controllers/gitrepository_controller.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go index 6c173cd63..6e4f6e704 100644 --- a/controllers/gitrepository_controller.go +++ b/controllers/gitrepository_controller.go @@ -272,10 +272,15 @@ func (r *GitRepositoryReconciler) reconcile(ctx context.Context, repository sour if err != nil { return sourcev1.GitRepositoryNotReady(repository, sourcev1.GitOperationFailedReason, err.Error()), err } - commit, revision, err := checkoutStrategy.Checkout(ctx, tmpGit, repository.Spec.URL, auth) + + gitCtx, cancel := context.WithTimeout(ctx, repository.Spec.Timeout.Duration) + defer cancel() + + commit, revision, err := checkoutStrategy.Checkout(gitCtx, tmpGit, repository.Spec.URL, auth) if err != nil { return sourcev1.GitRepositoryNotReady(repository, sourcev1.GitOperationFailedReason, err.Error()), err } + artifact := r.Storage.NewArtifactFor(repository.Kind, repository.GetObjectMeta(), revision, fmt.Sprintf("%s.tar.gz", commit.Hash())) // copy all included repository into the artifact