Skip to content

K
k3s
Unverified Commit 4ddc198c authored by ajatprabha's avatar ajatprabha
Browse files
Options

pin ResourceVersion precondition only when specified

parent 63f4827f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
pkg/registry/core/namespace/storage/storage.go
View file @ 4ddc198c
...@@ -147,9 +147,7 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp ...@@ -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,
......
staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go
View file @ 4ddc198c
...@@ -92,9 +92,7 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp ...@@ -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,
......
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