From 0a843a50ba5cad83a20929eeef61c232896a6b17 Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Mon, 26 Sep 2016 17:56:53 +0200 Subject: [PATCH] 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. --- pkg/controller/deployment/deployment_controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index c1b0922e2d7..716d0522136 100644 --- 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 {