Merge pull request #372 from fluxcd/git-timeout

Reinstate Git cloning timeout
fluxcd · Jun 2, 2021 · bfd7247 · bfd7247
2 parents 4087834 + b8128cf
commit bfd7247
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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