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

Fix unreachable code issue in helmchart reconciler

Author: hiddeco

controllers/helmchart_controller.go

@@ -502,20 +502,22 @@ func (r *HelmChartReconciler) reconcileFromTarballArtifact(ctx context.Context,
 		}
 		if f, err := os.Stat(srcPath); os.IsNotExist(err) || !f.Mode().IsRegular() {
 			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)
 		if err != nil {
 			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()
 
 		var valuesData []byte
-		if _, err := src.Read(valuesData); err == nil {
-			isValuesFileOverriden, err = helm.OverwriteChartDefaultValues(helmChart, valuesData)
+		if _, err := src.Read(valuesData); err != nil {
+			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 {
 			return sourcev1.HelmChartNotReady(chart, sourcev1.ChartPackageFailedReason, err.Error()), err
 		}