Merge pull request #8331 from bparees/newapp_label

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/cli/cmd/newapp.go

@@ -241,11 +241,15 @@ func (o *NewAppOptions) Run() error {
 		return err
 	}
 
+	// if the user has set the "app" label explicitly on their objects in the template,
+	// we should not return a failure when we can't set it ourselves.
+	ignoreLabelFailure := false
 	if len(config.Labels) == 0 && len(result.Name) > 0 {
 		config.Labels = map[string]string{"app": result.Name}
+		ignoreLabelFailure = true
 	}
 
-	if err := setLabels(config.Labels, result); err != nil {
+	if err := setLabels(config.Labels, result, ignoreLabelFailure); err != nil {
 		return err
 	}
 
@@ -518,10 +522,10 @@ func setAnnotations(annotations map[string]string, result *newcmd.AppResult) err
 	return nil
 }
 
-func setLabels(labels map[string]string, result *newcmd.AppResult) error {
+func setLabels(labels map[string]string, result *newcmd.AppResult, ignoreFailure bool) error {
 	for _, object := range result.List.Items {
 		err := util.AddObjectLabels(object, labels)
-		if err != nil {
+		if err != nil && !ignoreFailure {
 			return err
 		}
 	}

pkg/cmd/cli/cmd/newbuild.go

@@ -190,7 +190,7 @@ func (o *NewBuildOptions) Run() error {
 		config.Labels = map[string]string{"build": result.Name}
 	}
 
-	if err := setLabels(config.Labels, result); err != nil {
+	if err := setLabels(config.Labels, result, false); err != nil {
 		return err
 	}
 	if err := setAnnotations(map[string]string{newcmd.GeneratedByNamespace: newcmd.GeneratedByNewBuild}, result); err != nil {

test/cmd/newapp.sh

@@ -60,6 +60,11 @@ 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'
 
+# verify we can create from a template when some objects in the template declare an app label
+# the app label should still be applied to the other objects in the template.
+os::cmd::expect_success_and_text 'oc new-app -f test/fixtures/template-with-app-label.json -o yaml' 'app: ruby-sample-build'
+os::cmd::expect_success_and_text 'oc new-app -f test/fixtures/template-with-app-label.json -o yaml' 'app: myapp'
+
 # check search
 os::cmd::expect_success_and_text 'oc new-app --search mysql' "Tags:\s+5.5, 5.6, latest"
 os::cmd::expect_success_and_text 'oc new-app --search ruby-helloworld-sample' 'ruby-helloworld-sample'