Pass ResourceVersion in Scale object back to RC before updating RC so that it…

Pass ResourceVersion in Scale object back to RC before updating RC so that it can be used to check for conflicts.

Pass ResourceVersion in Scale object back to RC before updating RC so that it…
e8ee3eda · Madhusudan.C.S · 108f7226 · e8ee3eda
Commit e8ee3eda authored Mar 09, 2016 by Madhusudan.C.S
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

etcd.go pkg/registry/experimental/controller/etcd/etcd.go +1 -0

No files found.
--- 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)