github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 05:14:54 +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/deployment/deploymentcontroller.go
View File

@@ -188,7 +188,7 @@ func NewDeploymentController(federationClient fedclientset.Interface) *Deploymen
),
)
fdc.fedUpdater = fedutil.NewFederatedUpdater(fdc.fedDeploymentInformer, "deployment", fdc.eventRecorder,
fdc.fedUpdater = fedutil.NewFederatedUpdater(fdc.fedDeploymentInformer, "deployment", updateTimeout, fdc.eventRecorder,
func(client kubeclientset.Interface, obj runtime.Object) error {
rs := obj.(*extensionsv1.Deployment)
_, err := client.Extensions().Deployments(rs.Namespace).Create(rs)
@@ -213,7 +213,6 @@ func NewDeploymentController(federationClient fedclientset.Interface) *Deploymen
deployment := obj.(*extensionsv1.Deployment)
return fmt.Sprintf("%s/%s", deployment.Namespace, deployment.Name)
},
updateTimeout,
fdc.fedDeploymentInformer,
fdc.fedUpdater,
)
@@ -567,7 +566,7 @@ func (fdc *DeploymentController) reconcileDeployment(key string) (reconciliation
// Everything is in order
return statusAllOk, nil
}
err = fdc.fedUpdater.Update(operations, updateTimeout)
err = fdc.fedUpdater.Update(operations)
if err != nil {
glog.Errorf("Failed to execute updates for %s: %v", key, err)
return statusError, err