github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

fed: Provide updater timeout to instance rather than to Update()

Browse Source
This commit is contained in:
Maru Newby
2017-05-04 13:37:33 -07:00
parent 3fbfafdd0a
commit 3f2dab896c
9 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
federation/pkg/federation-controller/sync/controller.go
View File

@@ -172,7 +172,7 @@ func newFederationSyncController(client federationclientset.Interface, adapter f
)
// Federated updeater along with Create/Update/Delete operations.
s.updater = util.NewFederatedUpdater(s.informer, adapter.Kind(), s.eventRecorder,
s.updater = util.NewFederatedUpdater(s.informer, adapter.Kind(), s.updateTimeout, s.eventRecorder,
func(client kubeclientset.Interface, obj pkgruntime.Object) error {
_, err := adapter.ClusterCreate(client, obj)
return err
@@ -194,7 +194,6 @@ func newFederationSyncController(client federationclientset.Interface, adapter f
func(obj pkgruntime.Object) string {
return adapter.NamespacedName(obj).String()
},
s.updateTimeout,
s.informer,
s.updater,
)
@@ -414,7 +413,7 @@ func (s *FederationSyncController) reconcile(namespacedName types.NamespacedName
return statusAllOK
}
err = s.updater.Update(operations, s.updateTimeout)
err = s.updater.Update(operations)
if err != nil {
glog.Errorf("failed to execute updates for %s: %v", key, err)
return statusError