scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for ResourceVersion conflict in separate if block

Browse Source
This commit is contained in:
ajatprabha
2019-02-15 04:37:18 +05:30
parent 8f48d76271
commit 42f0a36f44
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/core/namespace/storage/storage.go
View File

@@ -139,7 +139,6 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
}
if options.Preconditions.UID == nil {
options.Preconditions.UID = &namespace.UID
options.Preconditions.ResourceVersion = &namespace.ResourceVersion
} else if *options.Preconditions.UID != namespace.UID {
err = apierrors.NewConflict(
api.Resource("namespaces"),
@@ -147,6 +146,9 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
fmt.Errorf("Precondition failed: UID in precondition: %v, UID in object meta: %v", *options.Preconditions.UID, namespace.UID),
)
return nil, false, err
}
if options.Preconditions.ResourceVersion == nil {
options.Preconditions.ResourceVersion = &namespace.ResourceVersion
} else if *options.Preconditions.ResourceVersion != namespace.ResourceVersion {
err = apierrors.NewConflict(
api.Resource("namespaces"),