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

Merge pull request #261 from fluxcd/fix-tarball-chart-reconcile-err-handling 

Fix unreachable code issue in helmchart reconciler
This commit is contained in:
Hidde Beydals 2021-01-18 22:54:38 +01:00 committed by GitHub
parent 2c7c1888e3 778b07cdd4
commit fb6a94e07f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
controllers/helmchart_controller.go
View File

@ -502,20 +502,22 @@ func (r *HelmChartReconciler) reconcileFromTarballArtifact(ctx context.Context,
} }
if f, err := os.Stat(srcPath); os.IsNotExist(err) || !f.Mode().IsRegular() { if f, err := os.Stat(srcPath); os.IsNotExist(err) || !f.Mode().IsRegular() {
err = fmt.Errorf("invalid values file path: %s", chart.Spec.ValuesFile) err = fmt.Errorf("invalid values file path: %s", chart.Spec.ValuesFile)
return chart, err return sourcev1.HelmChartNotReady(chart, sourcev1.StorageOperationFailedReason, err.Error()), err
} }
src, err := os.Open(srcPath) src, err := os.Open(srcPath)
if err != nil { if err != nil {
err = fmt.Errorf("failed to open values file '%s': %w", chart.Spec.ValuesFile, err) err = fmt.Errorf("failed to open values file '%s': %w", chart.Spec.ValuesFile, err)
return chart, err return sourcev1.HelmChartNotReady(chart, sourcev1.StorageOperationFailedReason, err.Error()), err
} }
defer src.Close() defer src.Close()
var valuesData []byte var valuesData []byte
if _, err := src.Read(valuesData); err == nil { if _, err := src.Read(valuesData); err != nil {
isValuesFileOverriden, err = helm.OverwriteChartDefaultValues(helmChart, valuesData) err = fmt.Errorf("failed to read from values file '%s': %w", chart.Spec.ValuesFile, err)
return sourcev1.HelmChartNotReady(chart, sourcev1.StorageOperationFailedReason, err.Error()), err
} }
isValuesFileOverriden, err = helm.OverwriteChartDefaultValues(helmChart, valuesData)
if err != nil { if err != nil {
return sourcev1.HelmChartNotReady(chart, sourcev1.ChartPackageFailedReason, err.Error()), err return sourcev1.HelmChartNotReady(chart, sourcev1.ChartPackageFailedReason, err.Error()), err
} }