From 7ce6db18195b7ec3b056bb554932dd09df768204 Mon Sep 17 00:00:00 2001 From: Sascha Schwarze Date: Wed, 18 Oct 2023 21:02:06 +0200 Subject: [PATCH] Fix handling of legacy parameters --- pkg/apis/build/v1beta1/buildstrategy_conversion.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/build/v1beta1/buildstrategy_conversion.go b/pkg/apis/build/v1beta1/buildstrategy_conversion.go index cd3155a8a..1b0715faf 100644 --- a/pkg/apis/build/v1beta1/buildstrategy_conversion.go +++ b/pkg/apis/build/v1beta1/buildstrategy_conversion.go @@ -114,13 +114,13 @@ func (src *BuildStrategySpec) ConvertTo(bs *v1alpha1.BuildStrategySpec) { } for argIndex, arg := range buildStep.Args { - if strings.Contains(arg, "$(params.dockerfile)") { + if strings.Contains(arg, "$(params.builder-image)") { buildStep.Args[argIndex] = strings.ReplaceAll(arg, "$(params.builder-image)", "$(build.builder.image)") } } for envIndex, env := range buildStep.Env { - if strings.Contains(env.Value, "$(params.dockerfile)") { + if strings.Contains(env.Value, "$(params.builder-image)") { buildStep.Env[envIndex].Value = strings.ReplaceAll(env.Value, "$(params.builder-image)", "$(build.builder.image)") } } @@ -212,7 +212,7 @@ func (src *BuildStrategySpec) ConvertFrom(bs v1alpha1.BuildStrategySpec) { } if strings.Contains(arg, "$(build.builder.image)") { usesBuilderImage = true - step.Command[argIndex] = strings.ReplaceAll(arg, "$(build.builder.image)", "$(params.builder-image)") + step.Args[argIndex] = strings.ReplaceAll(arg, "$(build.builder.image)", "$(params.builder-image)") } } @@ -227,7 +227,7 @@ func (src *BuildStrategySpec) ConvertFrom(bs v1alpha1.BuildStrategySpec) { } if strings.Contains(env.Value, "$(build.builder.image)") { usesBuilderImage = true - step.Command[envIndex] = strings.ReplaceAll(env.Value, "$(build.builder.image)", "$(params.builder-image)") + step.Env[envIndex].Value = strings.ReplaceAll(env.Value, "$(build.builder.image)", "$(params.builder-image)") } }