From 778b07cdd42bae0f94d57ed37f30a00a9796596a Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Mon, 18 Jan 2021 22:21:40 +0200 Subject: [PATCH] Fix unreachable code issue in helmchart reconciler Signed-off-by: Aurel Canciu --- controllers/helmchart_controller.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go index d48bd2e2..8dcd22de 100644 --- a/controllers/helmchart_controller.go +++ b/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 }