Skip to content

Commit 99837b5

Browse files
tete17Miguel Sacristan
authored and
Miguel Sacristan
committed
Fix linter
1 parent 36b12b0 commit 99837b5

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

pkg/skaffold/deploy/helm.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ func (h *HelmDeployer) Render(ctx context.Context, out io.Writer, builds []build
234234
}
235235

236236
for _, r := range h.Releases {
237-
238237
args := []string{"template", r.ChartPath}
239238

240239
if hv.GTE(helm3Version) {
@@ -248,10 +247,7 @@ func (h *HelmDeployer) Render(ctx context.Context, out io.Writer, builds []build
248247
args = append(args, "--values", vf)
249248
}
250249

251-
params, err := pairParamsToArtifacts(builds, r.Values)
252-
if err != nil {
253-
return fmt.Errorf("matching build results to chart values: %w", err)
254-
}
250+
params := pairParamsToArtifacts(builds, r.Values)
255251

256252
for k, v := range params {
257253
var value string
@@ -478,21 +474,16 @@ func installArgs(r latest.HelmRelease, builds []build.Artifact, valuesSet map[st
478474
args = append(args, "--namespace", o.namespace)
479475
}
480476

481-
params, err := pairParamsToArtifacts(builds, r.Values)
482-
if err != nil {
483-
return nil, fmt.Errorf("matching build results to chart values: %w", err)
484-
}
477+
params := pairParamsToArtifacts(builds, r.Values)
485478

486479
if len(r.Overrides.Values) != 0 {
487480
args = append(args, "-f", constants.HelmOverridesFilename)
488481
}
489482

490483
for k, v := range params {
491-
var value string
492-
493484
cfg := r.ImageStrategy.HelmImageConfig.HelmConventionConfig
494485

495-
value, err = imageSetFromConfig(cfg, k, v.Tag)
486+
value, err := imageSetFromConfig(cfg, k, v.Tag)
496487
if err != nil {
497488
return nil, err
498489
}
@@ -675,7 +666,7 @@ func imageSetFromConfig(cfg *latest.HelmConventionConfig, valueName string, tag
675666
}
676667

677668
// pairParamsToArtifacts associates parameters to the build artifact it creates
678-
func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) (map[string]build.Artifact, error) {
669+
func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) map[string]build.Artifact {
679670
imageToBuildResult := map[string]build.Artifact{}
680671
for _, b := range builds {
681672
imageToBuildResult[b.ImageName] = b
@@ -690,5 +681,5 @@ func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) (m
690681
}
691682
}
692683

693-
return paramToBuildResult, nil
684+
return paramToBuildResult
694685
}

0 commit comments

Comments
 (0)