Fix linter

GoogleContainerTools · Apr 9, 2020 · 99837b5 · 99837b5
1 parent 36b12b0
commit 99837b5
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/pkg/skaffold/deploy/helm.go b/pkg/skaffold/deploy/helm.go
@@ -234,7 +234,6 @@ func (h *HelmDeployer) Render(ctx context.Context, out io.Writer, builds []build
 	}
 
 	for _, r := range h.Releases {
-
 		args := []string{"template", r.ChartPath}
 
 		if hv.GTE(helm3Version) {
@@ -248,10 +247,7 @@ func (h *HelmDeployer) Render(ctx context.Context, out io.Writer, builds []build
 			args = append(args, "--values", vf)
 		}
 
-		params, err := pairParamsToArtifacts(builds, r.Values)
-		if err != nil {
-			return fmt.Errorf("matching build results to chart values: %w", err)
-		}
+		params := pairParamsToArtifacts(builds, r.Values)
 
 		for k, v := range params {
 			var value string
@@ -478,21 +474,16 @@ func installArgs(r latest.HelmRelease, builds []build.Artifact, valuesSet map[st
 		args = append(args, "--namespace", o.namespace)
 	}
 
-	params, err := pairParamsToArtifacts(builds, r.Values)
-	if err != nil {
-		return nil, fmt.Errorf("matching build results to chart values: %w", err)
-	}
+	params := pairParamsToArtifacts(builds, r.Values)
 
 	if len(r.Overrides.Values) != 0 {
 		args = append(args, "-f", constants.HelmOverridesFilename)
 	}
 
 	for k, v := range params {
-		var value string
-
 		cfg := r.ImageStrategy.HelmImageConfig.HelmConventionConfig
 
-		value, err = imageSetFromConfig(cfg, k, v.Tag)
+		value, err := imageSetFromConfig(cfg, k, v.Tag)
 		if err != nil {
 			return nil, err
 		}
@@ -675,7 +666,7 @@ func imageSetFromConfig(cfg *latest.HelmConventionConfig, valueName string, tag
 }
 
 // pairParamsToArtifacts associates parameters to the build artifact it creates
-func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) (map[string]build.Artifact, error) {
+func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) map[string]build.Artifact {
 	imageToBuildResult := map[string]build.Artifact{}
 	for _, b := range builds {
 		imageToBuildResult[b.ImageName] = b
@@ -690,5 +681,5 @@ func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) (m
 		}
 	}
 
-	return paramToBuildResult, nil
+	return paramToBuildResult
 }