oc new-app --build-env doesn't work on templates

Fixes #14906

Author: coreydaley

pkg/build/util/util.go

@@ -349,6 +349,22 @@ func SafeForLoggingS2IConfig(config *s2iapi.Config) *s2iapi.Config {
 	return &newConfig
 }
 
+// GetBuildConfigEnv gets the buildconfig strategy environment
+func GetBuildConfigEnv(buildConfig *buildapi.BuildConfig) []kapi.EnvVar {
+	switch {
+	case buildConfig.Spec.Strategy.SourceStrategy != nil:
+		return buildConfig.Spec.Strategy.SourceStrategy.Env
+	case buildConfig.Spec.Strategy.DockerStrategy != nil:
+		return buildConfig.Spec.Strategy.DockerStrategy.Env
+	case buildConfig.Spec.Strategy.CustomStrategy != nil:
+		return buildConfig.Spec.Strategy.CustomStrategy.Env
+	case buildConfig.Spec.Strategy.JenkinsPipelineStrategy != nil:
+		return buildConfig.Spec.Strategy.JenkinsPipelineStrategy.Env
+	default:
+		return nil
+	}
+}
+
 // GetBuildEnv gets the build strategy environment
 func GetBuildEnv(build *buildapi.Build) []kapi.EnvVar {
 	switch {
@@ -365,6 +381,23 @@ func GetBuildEnv(build *buildapi.Build) []kapi.EnvVar {
 	}
 }
 
+// SetBuildConfigEnv replaces the current buildconfig environment
+func SetBuildConfigEnv(buildConfig *buildapi.BuildConfig, env []kapi.EnvVar) {
+	var oldEnv *[]kapi.EnvVar
+
+	switch {
+	case buildConfig.Spec.Strategy.SourceStrategy != nil:
+		oldEnv = &buildConfig.Spec.Strategy.SourceStrategy.Env
+	case buildConfig.Spec.Strategy.DockerStrategy != nil:
+		oldEnv = &buildConfig.Spec.Strategy.DockerStrategy.Env
+	case buildConfig.Spec.Strategy.CustomStrategy != nil:
+		oldEnv = &buildConfig.Spec.Strategy.CustomStrategy.Env
+	case buildConfig.Spec.Strategy.JenkinsPipelineStrategy != nil:
+		oldEnv = &buildConfig.Spec.Strategy.JenkinsPipelineStrategy.Env
+	}
+	*oldEnv = env
+}
+
 // SetBuildEnv replaces the current build environment
 func SetBuildEnv(build *buildapi.Build, env []kapi.EnvVar) {
 	var oldEnv *[]kapi.EnvVar
@@ -380,7 +413,6 @@ func SetBuildEnv(build *buildapi.Build, env []kapi.EnvVar) {
 		oldEnv = &build.Spec.Strategy.JenkinsPipelineStrategy.Env
 	}
 	*oldEnv = env
-
 }
 
 // UpdateBuildEnv updates the strategy environment

pkg/generate/app/cmd/newapp.go

@@ -466,7 +466,7 @@ func (c *AppConfig) buildPipelines(components app.ComponentReferences, environme
 }
 
 // buildTemplates converts a set of resolved, valid references into references to template objects.
-func (c *AppConfig) buildTemplates(components app.ComponentReferences, parameters app.Environment, environment app.Environment) (string, []runtime.Object, error) {
+func (c *AppConfig) buildTemplates(components app.ComponentReferences, parameters app.Environment, environment app.Environment, buildEnvironment app.Environment) (string, []runtime.Object, error) {
 	objects := []runtime.Object{}
 	name := ""
 	for _, ref := range components {
@@ -485,6 +485,12 @@ func (c *AppConfig) buildTemplates(components app.ComponentReferences, parameter
 			// if environment variables were passed in, let's apply the environment variables
 			// to every pod template object
 			for i := range result.Objects {
+				switch result.Objects[i].(type) {
+				case *buildapi.BuildConfig:
+					buildEnv := buildutil.GetBuildConfigEnv(result.Objects[i].(*buildapi.BuildConfig))
+					buildEnv = app.JoinEnvironment(buildEnv, buildEnvironment.List())
+					buildutil.SetBuildConfigEnv(result.Objects[i].(*buildapi.BuildConfig), buildEnv)
+				}
 				podSpec, _, err := ometa.GetPodSpec(result.Objects[i])
 				if err == nil {
 					for ii := range podSpec.Containers {
@@ -805,7 +811,7 @@ func (c *AppConfig) Run() (*AppResult, error) {
 
 	objects = app.AddServices(objects, false)
 
-	templateName, templateObjects, err := c.buildTemplates(components.TemplateComponentRefs(), parameters, env)
+	templateName, templateObjects, err := c.buildTemplates(components.TemplateComponentRefs(), parameters, env, buildenv)
 	if err != nil {
 		return nil, err
 	}

test/cmd/newapp.sh

@@ -71,6 +71,8 @@ os::cmd::expect_success_and_text 'oc new-app -f test/testdata/template-with-name
 # non-string parameterized values should be stripped
 os::cmd::expect_failure_and_text 'oc new-app -f test/testdata/template-with-namespaces.json -o jsonpath="{.items[?(@.metadata.name==\"route-edge-refstripped\")].metadata.namespace}"' 'namespace is not found'
 os::cmd::expect_failure_and_text 'oc new-app -f test/testdata/template-with-namespaces.json -o jsonpath="{.items[?(@.metadata.name==\"route-edge-prefix-refstripped\")].metadata.namespace}"' 'namespace is not found'
+# ensure --build-env environment variables get added to the buildconfig
+os::cmd::expect_success_and_text 'oc new-app -f test/testdata/template-with-app-label.json --build-env FOO=bar -o yaml' 'FOO'
 # ensure the objects can actually get created with a namespace specified
 project=$(oc project -q)
 os::cmd::expect_success 'oc new-project template-substitute'