Skip to content

K
k3s
Commit 6773c2b6 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #22769 from madhusudancs/scale-rc-rv

Auto commit by PR queue bot
parents 0c10fce9 e8ee3eda
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
pkg/registry/experimental/controller/etcd/etcd.go
View file @ 6773c2b6
...@@ -88,6 +88,7 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, ...@@ -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) return nil, false, errors.NewNotFound(extensions.Resource("replicationcontrollers/scale"), scale.Name)
} }
rc.Spec.Replicas = scale.Spec.Replicas rc.Spec.Replicas = scale.Spec.Replicas
rc.ResourceVersion = scale.ResourceVersion
rc, err = (*r.registry).UpdateController(ctx, rc) rc, err = (*r.registry).UpdateController(ctx, rc)
if err != nil { if err != nil {
return nil, false, errors.NewConflict(extensions.Resource("replicationcontrollers/scale"), scale.Name, err) return nil, false, errors.NewConflict(extensions.Resource("replicationcontrollers/scale"), scale.Name, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment