scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +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 { if options.Preconditions.UID == nil {
options.Preconditions.UID = &namespace.UID options.Preconditions.UID = &namespace.UID
options.Preconditions.ResourceVersion = &namespace.ResourceVersion
} else if *options.Preconditions.UID != namespace.UID { } else if *options.Preconditions.UID != namespace.UID {
err = apierrors.NewConflict( err = apierrors.NewConflict(
api.Resource("namespaces"), 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), fmt.Errorf("Precondition failed: UID in precondition: %v, UID in object meta: %v", *options.Preconditions.UID, namespace.UID),
) )
return nil, false, err return nil, false, err
}
if options.Preconditions.ResourceVersion == nil {
options.Preconditions.ResourceVersion = &namespace.ResourceVersion
} else if *options.Preconditions.ResourceVersion != namespace.ResourceVersion { } else if *options.Preconditions.ResourceVersion != namespace.ResourceVersion {
err = apierrors.NewConflict( err = apierrors.NewConflict(
api.Resource("namespaces"), api.Resource("namespaces"),

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

@@ -84,7 +84,6 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
} }
if options.Preconditions.UID == nil { if options.Preconditions.UID == nil {
options.Preconditions.UID = &crd.UID options.Preconditions.UID = &crd.UID
options.Preconditions.ResourceVersion = &crd.ResourceVersion
} else if *options.Preconditions.UID != crd.UID { } else if *options.Preconditions.UID != crd.UID {
err = apierrors.NewConflict( err = apierrors.NewConflict(
apiextensions.Resource("customresourcedefinitions"), apiextensions.Resource("customresourcedefinitions"),
@@ -92,6 +91,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, crd.UID), fmt.Errorf("Precondition failed: UID in precondition: %v, UID in object meta: %v", *options.Preconditions.UID, crd.UID),
) )
return nil, false, err return nil, false, err
}
if options.Preconditions.ResourceVersion == nil {
options.Preconditions.ResourceVersion = &crd.ResourceVersion
} else if *options.Preconditions.ResourceVersion != crd.ResourceVersion { } else if *options.Preconditions.ResourceVersion != crd.ResourceVersion {
err = apierrors.NewConflict( err = apierrors.NewConflict(
apiextensions.Resource("customresourcedefinitions"), apiextensions.Resource("customresourcedefinitions"),

2
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/helpers.go
View File

@@ -228,7 +228,7 @@ func NewUIDPreconditions(uid string) *Preconditions {
return &Preconditions{UID: &u} return &Preconditions{UID: &u}
} }
// NewPreconditionDeleteOptionsWithResourceVersion returns a DeleteOptions with a UID precondition set. // NewPreconditionDeleteOptionsWithResourceVersion returns a DeleteOptions with a ResourceVersion precondition set.
func NewPreconditionDeleteOptionsWithResourceVersion(rv string) *DeleteOptions { func NewPreconditionDeleteOptionsWithResourceVersion(rv string) *DeleteOptions {
p := Preconditions{ResourceVersion: &rv} p := Preconditions{ResourceVersion: &rv}
return &DeleteOptions{Preconditions: &p} return &DeleteOptions{Preconditions: &p}

2
staging/src/k8s.io/apiserver/pkg/registry/rest/delete.go
View File

@@ -82,7 +82,7 @@ func BeforeDelete(strategy RESTDeleteStrategy, ctx context.Context, obj runtime.
return false, false, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, objectMeta.GetName(), fmt.Errorf("the UID in the precondition (%s) does not match the UID in record (%s). The object might have been deleted and then recreated", *options.Preconditions.UID, objectMeta.GetUID())) return false, false, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, objectMeta.GetName(), fmt.Errorf("the UID in the precondition (%s) does not match the UID in record (%s). The object might have been deleted and then recreated", *options.Preconditions.UID, objectMeta.GetUID()))
} }
if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != objectMeta.GetResourceVersion() { if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != objectMeta.GetResourceVersion() {
return false, false, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, objectMeta.GetName(), fmt.Errorf("the ResourceVersion in the precondition (%s) does not match the ResourceVersion in record (%s). The object might have been deleted and then recreated", *options.Preconditions.ResourceVersion, objectMeta.GetResourceVersion())) return false, false, errors.NewConflict(schema.GroupResource{Group: gvk.Group, Resource: gvk.Kind}, objectMeta.GetName(), fmt.Errorf("the ResourceVersion in the precondition (%s) does not match the ResourceVersion in record (%s). The object might have been modified", *options.Preconditions.ResourceVersion, objectMeta.GetResourceVersion()))
} }
} }
gracefulStrategy, ok := strategy.(RESTGracefulDeleteStrategy) gracefulStrategy, ok := strategy.(RESTGracefulDeleteStrategy)