github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pin ResourceVersion precondition only when specified

pull/564/head
ajatprabha 2019-02-16 12:32:57 +05:30
parent 63f4827fca
commit 4ddc198c39
No known key found for this signature in database
GPG Key ID: A7A5C9C2584B721A
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,9 +147,7 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
) )
return nil, false, err return nil, false, err
} }
if options.Preconditions.ResourceVersion == nil { if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != namespace.ResourceVersion {
options.Preconditions.ResourceVersion = &namespace.ResourceVersion
} else if *options.Preconditions.ResourceVersion != namespace.ResourceVersion {
err = apierrors.NewConflict( err = apierrors.NewConflict(
api.Resource("namespaces"), api.Resource("namespaces"),
name, name,

4
staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go
View File

@ -92,9 +92,7 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
) )
return nil, false, err return nil, false, err
} }
if options.Preconditions.ResourceVersion == nil { if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != crd.ResourceVersion {
options.Preconditions.ResourceVersion = &crd.ResourceVersion
} else if *options.Preconditions.ResourceVersion != crd.ResourceVersion {
err = apierrors.NewConflict( err = apierrors.NewConflict(
apiextensions.Resource("customresourcedefinitions"), apiextensions.Resource("customresourcedefinitions"),
name, name,