diff --git a/pkg/cmd/cli/describe/deployments.go b/pkg/cmd/cli/describe/deployments.go index 700a0b28af9f..2bbf6f2c51f8 100644 --- a/pkg/cmd/cli/describe/deployments.go +++ b/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\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: diff --git a/pkg/cmd/cli/describe/describer_test.go b/pkg/cmd/cli/describe/describer_test.go index a3e84a671eb1..cbbe6c38bc64 100644 --- a/pkg/cmd/cli/describe/describer_test.go +++ b/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() diff --git a/pkg/deploy/api/test/ok.go b/pkg/deploy/api/test/ok.go index a98b972cce82..6a756a93f38c 100644 --- a/pkg/deploy/api/test/ok.go +++ b/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{