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

This commit is contained in:
Madhusudan.C.S 2016-03-09 19:44:21 -08:00
parent 108f722657
commit e8ee3eda2a

View File

@ -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)