pin ResourceVersion precondition only when specified

ajatprabha · ajatprabha · commit 4ddc198c39cc · 2019-03-12T17:00:41.000+05:30
diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go
@@ -147,9 +147,7 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
 		)
 		return nil, false, err
 	}
-	if options.Preconditions.ResourceVersion == nil {
-		options.Preconditions.ResourceVersion = &namespace.ResourceVersion
-	} else if *options.Preconditions.ResourceVersion != namespace.ResourceVersion {
+	if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != namespace.ResourceVersion {
 		err = apierrors.NewConflict(
 			api.Resource("namespaces"),
 			name,
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/etcd.go
@@ -92,9 +92,7 @@ func (r *REST) Delete(ctx context.Context, name string, options *metav1.DeleteOp
 		)
 		return nil, false, err
 	}
-	if options.Preconditions.ResourceVersion == nil {
-		options.Preconditions.ResourceVersion = &crd.ResourceVersion
-	} else if *options.Preconditions.ResourceVersion != crd.ResourceVersion {
+	if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != crd.ResourceVersion {
 		err = apierrors.NewConflict(
 			apiextensions.Resource("customresourcedefinitions"),
 			name,

Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,7 @@ func (r REST) Delete(ctx context.Context, name string, options metav1.DeleteOp`
`147`	`147`	`)`
`148`	`148`	`return nil, false, err`
`149`	`149`	`}`
`150`		`- if options.Preconditions.ResourceVersion == nil {`
`151`		`- options.Preconditions.ResourceVersion = &namespace.ResourceVersion`
`152`		`- } else if *options.Preconditions.ResourceVersion != namespace.ResourceVersion {`
	`150`	`+ if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != namespace.ResourceVersion {`
`153`	`151`	`err = apierrors.NewConflict(`
`154`	`152`	`api.Resource("namespaces"),`
`155`	`153`	`name,`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,7 @@ func (r REST) Delete(ctx context.Context, name string, options metav1.DeleteOp`
`92`	`92`	`)`
`93`	`93`	`return nil, false, err`
`94`	`94`	`}`
`95`		`- if options.Preconditions.ResourceVersion == nil {`
`96`		`- options.Preconditions.ResourceVersion = &crd.ResourceVersion`
`97`		`- } else if *options.Preconditions.ResourceVersion != crd.ResourceVersion {`
	`95`	`+ if options.Preconditions.ResourceVersion != nil && *options.Preconditions.ResourceVersion != crd.ResourceVersion {`
`98`	`96`	`err = apierrors.NewConflict(`
`99`	`97`	`apiextensions.Resource("customresourcedefinitions"),`
`100`	`98`	`name,`