Skip to content

Commit 0e73395

Browse files
authored
Merge pull request #639 from fluxcd/no-stalling-in-include
gitrepo: Do not stall when no included artifact
2 parents 3cbb89d + a62fee5 commit 0e73395

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

controllers/gitrepository_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,12 +574,12 @@ func (r *GitRepositoryReconciler) reconcileInclude(ctx context.Context,
574574
Reason: "NotFound",
575575
}
576576
conditions.MarkTrue(obj, sourcev1.IncludeUnavailableCondition, e.Reason, e.Err.Error())
577-
return sreconcile.ResultEmpty, err
577+
return sreconcile.ResultEmpty, e
578578
}
579579

580580
// Confirm include has an artifact
581581
if dep.GetArtifact() == nil {
582-
e := &serror.Stalling{
582+
e := &serror.Event{
583583
Err: fmt.Errorf("no artifact available for include '%s'", incl.GitRepositoryRef.Name),
584584
Reason: "NoArtifact",
585585
}

0 commit comments

Comments
 (0)