@@ -234,7 +234,6 @@ func (h *HelmDeployer) Render(ctx context.Context, out io.Writer, builds []build
234
234
}
235
235
236
236
for _ , r := range h .Releases {
237
-
238
237
args := []string {"template" , r .ChartPath }
239
238
240
239
if hv .GTE (helm3Version ) {
@@ -248,10 +247,7 @@ func (h *HelmDeployer) Render(ctx context.Context, out io.Writer, builds []build
248
247
args = append (args , "--values" , vf )
249
248
}
250
249
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 )
255
251
256
252
for k , v := range params {
257
253
var value string
@@ -478,21 +474,16 @@ func installArgs(r latest.HelmRelease, builds []build.Artifact, valuesSet map[st
478
474
args = append (args , "--namespace" , o .namespace )
479
475
}
480
476
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 )
485
478
486
479
if len (r .Overrides .Values ) != 0 {
487
480
args = append (args , "-f" , constants .HelmOverridesFilename )
488
481
}
489
482
490
483
for k , v := range params {
491
- var value string
492
-
493
484
cfg := r .ImageStrategy .HelmImageConfig .HelmConventionConfig
494
485
495
- value , err = imageSetFromConfig (cfg , k , v .Tag )
486
+ value , err : = imageSetFromConfig (cfg , k , v .Tag )
496
487
if err != nil {
497
488
return nil , err
498
489
}
@@ -675,7 +666,7 @@ func imageSetFromConfig(cfg *latest.HelmConventionConfig, valueName string, tag
675
666
}
676
667
677
668
// 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 {
679
670
imageToBuildResult := map [string ]build.Artifact {}
680
671
for _ , b := range builds {
681
672
imageToBuildResult [b .ImageName ] = b
@@ -690,5 +681,5 @@ func pairParamsToArtifacts(builds []build.Artifact, params map[string]string) (m
690
681
}
691
682
}
692
683
693
- return paramToBuildResult , nil
684
+ return paramToBuildResult
694
685
}
0 commit comments