From 04c6fecbc7da54b4fae29e2f0fd24a0a49ba75f9 Mon Sep 17 00:00:00 2001 From: Michail Kargakis Date: Thu, 15 Dec 2016 16:52:36 +0100 Subject: [PATCH] controller: use defaultResync for the deployment controller --- pkg/controller/informers/extensions.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/controller/informers/extensions.go b/pkg/controller/informers/extensions.go index a5650cb5275..f98c7360a1d 100644 --- a/pkg/controller/informers/extensions.go +++ b/pkg/controller/informers/extensions.go @@ -18,7 +18,6 @@ package informers import ( "reflect" - "time" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -99,9 +98,7 @@ func (f *deploymentInformer) Informer() cache.SharedIndexInformer { }, }, &extensions.Deployment{}, - // TODO remove this. It is hardcoded so that "Waiting for the second deployment to clear overlapping annotation" in - // "overlapping deployment should not fight with each other" will work since it requires a full resync to work properly. - 30*time.Second, + f.defaultResync, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) f.informers[informerType] = informer