From e8ee3eda2a62a86d06c0f2f063b7c117f1c591d2 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Wed, 9 Mar 2016 19:44:21 -0800 Subject: [PATCH] Pass ResourceVersion in Scale object back to RC before updating RC so that it can be used to check for conflicts. --- pkg/registry/experimental/controller/etcd/etcd.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/registry/experimental/controller/etcd/etcd.go b/pkg/registry/experimental/controller/etcd/etcd.go index 7ba6c35f337b..7bf63be2edae 100644 --- a/pkg/registry/experimental/controller/etcd/etcd.go +++ b/pkg/registry/experimental/controller/etcd/etcd.go @@ -88,6 +88,7 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, return nil, false, errors.NewNotFound(extensions.Resource("replicationcontrollers/scale"), scale.Name) } rc.Spec.Replicas = scale.Spec.Replicas + rc.ResourceVersion = scale.ResourceVersion rc, err = (*r.registry).UpdateController(ctx, rc) if err != nil { return nil, false, errors.NewConflict(extensions.Resource("replicationcontrollers/scale"), scale.Name, err)