Skip to content

Commit fb45032

Browse files
committed
controllers: only handle BuildError
All other errors returned by `build*` are already properly wrapped. Signed-off-by: Hidde Beydals <[email protected]>
1 parent eb0a554 commit fb45032

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

controllers/helmchart_controller.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,14 @@ func (r *HelmChartReconciler) reconcileSource(ctx context.Context, obj *sourcev1
368368

369369
// Handle any build error
370370
if retErr != nil {
371-
e := fmt.Errorf("failed to build chart from source artifact: %w", retErr)
372-
retErr = &serror.Event{
373-
Err: e,
374-
Reason: meta.FailedReason,
375-
}
376-
if buildErr := new(chart.BuildError); errors.As(e, &buildErr) {
371+
if buildErr := new(chart.BuildError); errors.As(retErr, &buildErr) {
372+
retErr = &serror.Event{
373+
Err: buildErr,
374+
Reason: buildErr.Reason.Reason,
375+
}
377376
if chart.IsPersistentBuildErrorReason(buildErr.Reason) {
378377
retErr = &serror.Stalling{
379-
Err: e,
378+
Err: buildErr,
380379
Reason: buildErr.Reason.Reason,
381380
}
382381
}

0 commit comments

Comments
 (0)