fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes writing chart twice which results in a 0bytes tgz 

Signed-off-by: Raffael Sahli <raffael.sahli@doodle.com>
This commit is contained in:
Raffael Sahli 2021-02-09 10:17:07 +01:00
parent 568b2845c7
commit bc3c4e2a36
No known key found for this signature in database
GPG Key ID: 5E0BF46A67AD81C4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/helmchart_controller.go
View File

@ -403,8 +403,13 @@ func (r *HelmChartReconciler) reconcileFromHelmRepository(ctx context.Context,
if changed, err := helm.OverwriteChartDefaultValues(helmChart, valuesData); err != nil { if changed, err := helm.OverwriteChartDefaultValues(helmChart, valuesData); err != nil {
return sourcev1.HelmChartNotReady(chart, sourcev1.ChartPackageFailedReason, err.Error()), err return sourcev1.HelmChartNotReady(chart, sourcev1.ChartPackageFailedReason, err.Error()), err
} else if !changed { } else if !changed {
// No changes, skip to write original package to storage // No changes, write original package to storage
goto skipToDefault if err := r.Storage.AtomicWriteFile(&newArtifact, res, 0644); err != nil {
err = fmt.Errorf("unable to write chart file: %w", err)
return sourcev1.HelmChartNotReady(chart, sourcev1.StorageOperationFailedReason, err.Error()), err
}
break
} }
// Create temporary working directory // Create temporary working directory
@ -430,8 +435,6 @@ func (r *HelmChartReconciler) reconcileFromHelmRepository(ctx context.Context,
readyMessage = fmt.Sprintf("Fetched and packaged revision: %s", newArtifact.Revision) readyMessage = fmt.Sprintf("Fetched and packaged revision: %s", newArtifact.Revision)
readyReason = sourcev1.ChartPackageSucceededReason readyReason = sourcev1.ChartPackageSucceededReason
skipToDefault:
fallthrough
default: default:
// Write artifact to storage // Write artifact to storage
if err := r.Storage.AtomicWriteFile(&newArtifact, res, 0644); err != nil { if err := r.Storage.AtomicWriteFile(&newArtifact, res, 0644); err != nil {