Merge pull request #33492 from kargakis/stop-retrying-selector-overlaps

Automatic merge from submit-queue controller: don't retry deployments with overlapping selectors Returning an error will cause the deployment to be requeued. We should just emit an event for deployments with overlapping selectors and silently drop then out of the queue. This should be transitioned to a Condition once we have them. @kubernetes/deployment ptal

Merge pull request #33492 from kargakis/stop-retrying-selector-overlaps
7309d348 · Kubernetes Submit Queue · GitHub · ad864cd7 · 0a843a50 · 7309d348
Commit 7309d348 authored Sep 26, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 26, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

deployment_controller.go pkg/controller/deployment/deployment_controller.go +2 -1

No files found.
--- a/pkg/controller/deployment/deployment_controller.go
+++ b/pkg/controller/deployment/deployment_controller.go
@@ -508,7 +508,8 @@ func (dc *DeploymentController) syncDeployment(key string) error {

 	// Handle overlapping deployments by deterministically avoid syncing deployments that fight over ReplicaSets.
 	if err = dc.handleOverlap(d); err != nil {
-		return err
+		dc.eventRecorder.Eventf(deployment, api.EventTypeWarning, "SelectorOverlap", err.Error())
+		return nil
 	}

 	if d.Spec.Paused {