Merge pull request #14917 from nikhiljindal/deploymentController

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-02 13:18:49 -07:00
6 changed files with 258 additions and 94 deletions

View File

@@ -1435,6 +1435,10 @@ func (dd *DeploymentDescriber) Describe(namespace, name string) (string, error)
}
fmt.Fprintf(out, "NewReplicationController:\t%s\n", printReplicationControllersByLabels(newRCs))
}
events, err := dd.Events(namespace).Search(d)
if err == nil && events != nil {
DescribeEvents(events, out)
}
return nil
})
}