Merge pull request #10590 from mfojtik/cancel-events

OpenShift Bot · web-flow · commit dcacce60de5e · 2016-08-24T09:17:50.000-04:00
Merged by openshift-bot
diff --git a/pkg/deploy/controller/deployment/controller.go b/pkg/deploy/controller/deployment/controller.go
@@ -185,6 +185,7 @@ func (c *DeploymentController) Handle(deployment *kapi.ReplicationController) er
 				if err := c.cleanupDeployerPods(deployment); err != nil {
 					return err
 				}
+				c.emitDeploymentEvent(deployment, kapi.EventTypeNormal, "DeploymentCancelled", fmt.Sprintf("Deployment %q cancelled", deployutil.LabelForDeployment(deployment)))
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ func (c DeploymentController) Handle(deployment kapi.ReplicationController) er`
`185`	`185`	`if err := c.cleanupDeployerPods(deployment); err != nil {`
`186`	`186`	`return err`
`187`	`187`	`}`
	`188`	`+ c.emitDeploymentEvent(deployment, kapi.EventTypeNormal, "DeploymentCancelled", fmt.Sprintf("Deployment %q cancelled", deployutil.LabelForDeployment(deployment)))`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`