set env vars on oc new-app of template

Author: gabemontero

pkg/generate/app/cmd/newapp.go

@@ -22,6 +22,7 @@ import (
 	kutilerrors "k8s.io/kubernetes/pkg/util/errors"
 
 	dockerfileparser "github.com/docker/docker/builder/dockerfile/parser"
+	ometa "github.com/openshift/origin/pkg/api/meta"
 	authapi "github.com/openshift/origin/pkg/authorization/api"
 	buildapi "github.com/openshift/origin/pkg/build/api"
 	buildutil "github.com/openshift/origin/pkg/build/util"
@@ -361,21 +362,37 @@ 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, environment app.Environment) (string, []runtime.Object, error) {
+func (c *AppConfig) buildTemplates(components app.ComponentReferences, parameters app.Environment, environment app.Environment) (string, []runtime.Object, error) {
 	objects := []runtime.Object{}
 	name := ""
 	for _, ref := range components {
 		tpl := ref.Input().ResolvedMatch.Template
 
 		glog.V(4).Infof("processing template %s/%s", c.OriginNamespace, tpl.Name)
-		result, err := TransformTemplate(tpl, c.OSClient, c.OriginNamespace, environment)
+		result, err := TransformTemplate(tpl, c.OSClient, c.OriginNamespace, parameters)
 		if err != nil {
 			return name, nil, err
 		}
 		if len(name) == 0 {
 			name = tpl.Name
 		}
 		objects = append(objects, result.Objects...)
+		if len(result.Objects) > 0 {
+			// if environment variables were passed in, let's apply the environment variables
+			// to every pod template object
+			for i := range result.Objects {
+				podSpec, _, err := ometa.GetPodSpec(result.Objects[i])
+				if err == nil {
+					for ii := range podSpec.Containers {
+						if podSpec.Containers[ii].Env != nil {
+							podSpec.Containers[ii].Env = app.JoinEnvironment(environment.List(), podSpec.Containers[ii].Env)
+						} else {
+							podSpec.Containers[ii].Env = environment.List()
+						}
+					}
+				}
+			}
+		}
 
 		DescribeGeneratedTemplate(c.Out, ref.Input().String(), result, c.OriginNamespace)
 	}
@@ -666,7 +683,7 @@ func (c *AppConfig) Run() (*AppResult, error) {
 
 	objects = app.AddServices(objects, false)
 
-	templateName, templateObjects, err := c.buildTemplates(components.TemplateComponentRefs(), app.Environment(parameters))
+	templateName, templateObjects, err := c.buildTemplates(components.TemplateComponentRefs(), app.Environment(parameters), app.Environment(environment))
 	if err != nil {
 		return nil, err
 	}
@@ -710,6 +727,22 @@ func (c *AppConfig) Run() (*AppResult, error) {
 		}
 	}
 
+	/*
+		if len(templateObjects) > 0 {
+			for i := range objects {
+				podSpec, _, err := ometa.GetPodSpec(objects[i])
+				if err == nil {
+					for ii := range podSpec.Containers {
+						if podSpec.Containers[ii].Env != nil {
+							podSpec.Containers[ii].Env = app.JoinEnvironment(podSpec.Containers[ii].Env, app.Environment(environment).List())
+						} else {
+							podSpec.Containers[ii].Env = app.Environment(environment).List()
+						}
+					}
+				}
+			}
+		}
+	*/
 	return &AppResult{
 		List:      &kapi.List{Items: objects},
 		Name:      name,

pkg/generate/app/cmd/newapp_test.go

@@ -183,7 +183,7 @@ func TestBuildTemplates(t *testing.T) {
 			t.Errorf("%s: Unexpected error: %v", n, err)
 			continue
 		}
-		_, _, err = appCfg.buildTemplates(components, app.Environment(parms))
+		_, _, err = appCfg.buildTemplates(components, app.Environment(parms), app.Environment(map[string]string{}))
 		if err != nil {
 			t.Errorf("%s: Unexpected error: %v", n, err)
 		}

test/cmd/newapp.sh

@@ -62,6 +62,8 @@ os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample -o yaml' 'MY
 os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample -o yaml' 'ADMIN_USERNAME'
 os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample -o yaml' 'ADMIN_PASSWORD'
 os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample --param MYSQL_PASSWORD=hello -o yaml' 'hello'
+os::cmd::expect_success_and_text  'oc new-app -e FOO=BAR -f examples/jenkins/jenkins-ephemeral-template.json -o jsonpath="{.items[?(@.kind==\"DeploymentConfig\")].spec.template.spec.containers[0].env[?(@.name==\"FOO\")].value}" ' 'BAR'
+os::cmd::expect_success_and_text  'oc new-app -e OPENSHIFT_ENABLE_OAUTH=false -f examples/jenkins/jenkins-ephemeral-template.json -o jsonpath="{.items[?(@.kind==\"DeploymentConfig\")].spec.template.spec.containers[0].env[?(@.name==\"OPENSHIFT_ENABLE_OAUTH\")].value}" ' 'false'
 
 # check that values are not split on commas
 os::cmd::expect_success_and_text 'oc new-app ruby-helloworld-sample --param MYSQL_PASSWORD=hello,MYSQL_USER=fail -o yaml' 'value: hello,MYSQL_USER=fail'