Skip to content

K
k3s
Commit ee70adb9 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39243 from k82cn/avoid_keyword

Automatic merge from submit-queue Avoid keyword as var name. fixes typo
parents 79c00011 92f3ffb7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
pkg/genericapiserver/registry/generic/registry/store.go
View file @ ee70adb9
...@@ -408,8 +408,7 @@ func (e *Store) Update(ctx genericapirequest.Context, name string, objInfo rest. ...@@ -408,8 +408,7 @@ func (e *Store) Update(ctx genericapirequest.Context, name string, objInfo rest.
if err := rest.BeforeUpdate(e.UpdateStrategy, ctx, obj, existing); err != nil { if err := rest.BeforeUpdate(e.UpdateStrategy, ctx, obj, existing); err != nil {
return nil, nil, err return nil, nil, err
} }
delete := e.shouldDelete(ctx, key, obj, existing) if e.shouldDelete(ctx, key, obj, existing) {
if delete {
deleteObj = obj deleteObj = obj
return nil, nil, errEmptiedFinalizers return nil, nil, errEmptiedFinalizers
} }
......
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