From 8cd4459b6c5a575e1adcdd37c747a9c9d0adda0a Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Thu, 10 Nov 2016 15:45:56 +0100 Subject: [PATCH] Do not handle AlreadyExists errors yet --- pkg/controller/deployment/deployment_controller.go | 1 + pkg/controller/deployment/sync.go | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 4b23c4cd6e2..17986c7891f 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -301,6 +301,7 @@ func (dc *DeploymentController) handleErr(err error, key interface{}) { } utilruntime.HandleError(err) + glog.V(2).Infof("Dropping deployment %q out of the queue: %v", key, err) dc.queue.Forget(key) } diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 85654cc57d5..acc1131ef7b 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -357,8 +357,10 @@ func (dc *DeploymentController) getNewReplicaSet(deployment *extensions.Deployme createdRS, err := dc.client.Extensions().ReplicaSets(namespace).Create(&newRS) switch { // We may end up hitting this due to a slow cache or a fast resync of the deployment. - case errors.IsAlreadyExists(err): - return dc.rsLister.ReplicaSets(namespace).Get(newRS.Name) + // TODO: Restore once https://github.com/kubernetes/kubernetes/issues/29735 is fixed + // ie. we start using a new hashing algorithm. + // case errors.IsAlreadyExists(err): + // return dc.rsLister.ReplicaSets(namespace).Get(newRS.Name) case err != nil: msg := fmt.Sprintf("Failed to create new replica set %q: %v", newRS.Name, err) if deployment.Spec.ProgressDeadlineSeconds != nil {