Merge pull request #23467 from mikedanese/dont-sync-deployment

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-29 06:42:20 -07:00
3 changed files with 31 additions and 1 deletions

View File

@@ -426,6 +426,11 @@ func (dc *DeploymentController) syncDeployment(key string) error {
}
d := obj.(*extensions.Deployment)
everything := unversioned.LabelSelector{}
if reflect.DeepEqual(d.Spec.Selector, &everything) {
dc.eventRecorder.Eventf(d, api.EventTypeWarning, "SelectingAll", "This deployment is selecting all pods. A non-empty selector is required.")
return nil
}
if d.Spec.Paused {
// TODO: Implement scaling for paused deployments.