Render image trigger From field for deploy configs

Render deployment image trigger From field when present.

Closes openshift#874.

pkg/cmd/cli/describe/deployments.go

@@ -66,7 +66,7 @@ func (d *DeploymentConfigDescriber) Describe(namespace, name string) (string, er
 		}
 
 		printStrategy(deploymentConfig.Template.Strategy, out)
-		printTriggers(deploymentConfig.Triggers, out)
+		printTriggers(deploymentConfig.Namespace, deploymentConfig.Triggers, out)
 		printReplicationController(deploymentConfig.Template.ControllerTemplate, out)
 
 		return nil
@@ -90,7 +90,7 @@ func printStrategy(strategy deployapi.DeploymentStrategy, w io.Writer) {
 	}
 }
 
-func printTriggers(triggers []deployapi.DeploymentTriggerPolicy, w io.Writer) {
+func printTriggers(configNamespace string, triggers []deployapi.DeploymentTriggerPolicy, w io.Writer) {
 	if len(triggers) == 0 {
 		fmt.Fprint(w, "No triggers.")
 		return
@@ -103,9 +103,17 @@ func printTriggers(triggers []deployapi.DeploymentTriggerPolicy, w io.Writer) {
 		case deployapi.DeploymentTriggerOnConfigChange:
 			fmt.Fprintf(w, "\t\t<no options>\n")
 		case deployapi.DeploymentTriggerOnImageChange:
+			repo := t.ImageChangeParams.RepositoryName
+			if len(t.ImageChangeParams.From.Name) > 0 {
+				namespace := t.ImageChangeParams.From.Namespace
+				if len(namespace) == 0 {
+					namespace = configNamespace
+				}
+				repo = fmt.Sprintf("%s/%s", namespace, t.ImageChangeParams.From.Name)
+			}
 			fmt.Fprintf(w, "\t\tAutomatic:\t%v\n\t\tRepository:\t%s\n\t\tTag:\t%s\n",
 				t.ImageChangeParams.Automatic,
-				t.ImageChangeParams.RepositoryName,
+				repo,
 				t.ImageChangeParams.Tag,
 			)
 		default:

pkg/cmd/cli/describe/describer_test.go

@@ -73,6 +73,7 @@ func TestDeploymentConfigDescriber(t *testing.T) {
 	describe()
 
 	config.Triggers = append(config.Triggers, deployapitest.OkConfigChangeTrigger())
+	config.Triggers = append(config.Triggers, deployapitest.OkImageChangeTriggerNew())
 	describe()
 
 	config.Template.Strategy = deployapitest.OkCustomStrategy()

pkg/deploy/api/test/ok.go

@@ -104,6 +104,23 @@ func OkImageChangeTrigger() deployapi.DeploymentTriggerPolicy {
 	}
 }
 
+func OkImageChangeTriggerNew() deployapi.DeploymentTriggerPolicy {
+	return deployapi.DeploymentTriggerPolicy{
+		Type: deployapi.DeploymentTriggerOnImageChange,
+		ImageChangeParams: &deployapi.DeploymentTriggerImageChangeParams{
+			Automatic: true,
+			ContainerNames: []string{
+				"container1",
+			},
+			From: kapi.ObjectReference{
+				Namespace: kapi.NamespaceDefault,
+				Name:      "imageRepo",
+			},
+			Tag: "tag1",
+		},
+	}
+}
+
 func OkDeploymentConfig(version int) *deployapi.DeploymentConfig {
 	return &deployapi.DeploymentConfig{
 		ObjectMeta: kapi.ObjectMeta{