Skip to content

Commit bc3c4e2

Browse files
committed
fixes writing chart twice which results in a 0bytes tgz
Signed-off-by: Raffael Sahli <[email protected]>
1 parent 568b284 commit bc3c4e2

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

controllers/helmchart_controller.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,13 @@ func (r *HelmChartReconciler) reconcileFromHelmRepository(ctx context.Context,
403403
if changed, err := helm.OverwriteChartDefaultValues(helmChart, valuesData); err != nil {
404404
return sourcev1.HelmChartNotReady(chart, sourcev1.ChartPackageFailedReason, err.Error()), err
405405
} else if !changed {
406-
// No changes, skip to write original package to storage
407-
goto skipToDefault
406+
// No changes, write original package to storage
407+
if err := r.Storage.AtomicWriteFile(&newArtifact, res, 0644); err != nil {
408+
err = fmt.Errorf("unable to write chart file: %w", err)
409+
return sourcev1.HelmChartNotReady(chart, sourcev1.StorageOperationFailedReason, err.Error()), err
410+
}
411+
412+
break
408413
}
409414

410415
// Create temporary working directory
@@ -430,8 +435,6 @@ func (r *HelmChartReconciler) reconcileFromHelmRepository(ctx context.Context,
430435

431436
readyMessage = fmt.Sprintf("Fetched and packaged revision: %s", newArtifact.Revision)
432437
readyReason = sourcev1.ChartPackageSucceededReason
433-
skipToDefault:
434-
fallthrough
435438
default:
436439
// Write artifact to storage
437440
if err := r.Storage.AtomicWriteFile(&newArtifact, res, 0644); err != nil {

0 commit comments

Comments
 (0)