Merge pull request kubernetes-retired#55 from krishchow/finalizers

k8s-ci-robot · web-flow · commit ca1c6f1316ad · 2021-06-15T13:21:43.000-07:00
bug 54: finalizer update fix
diff --git a/container-object-storage-interface-controller/pkg/bucketaccessrequest/bucketaccessrequest.go b/container-object-storage-interface-controller/pkg/bucketaccessrequest/bucketaccessrequest.go
@@ -150,9 +150,6 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,
 	}
 
 	controllerutil.AddFinalizer(bucketAccessRequest, finalizer)
-	if _, err := b.bucketClient.ObjectstorageV1alpha1().BucketAccessRequests(bucketAccessRequest.Namespace).Update(ctx, bucketAccessRequest, metav1.UpdateOptions{}); err != nil {
-		return err
-	}
 
 	bucketAccessRequest.Status.BucketAccessName = bucketaccess.Name
 	bucketAccessRequest.Status.AccessGranted = true
diff --git a/container-object-storage-interface-controller/pkg/bucketrequest/bucketrequest.go b/container-object-storage-interface-controller/pkg/bucketrequest/bucketrequest.go
@@ -134,9 +134,6 @@ func (b *bucketRequestListener) provisionBucketRequestOperation(ctx context.Cont
 	}
 
 	controllerutil.AddFinalizer(bucketRequest, finalizer)
-	if _, err := b.bucketClient.ObjectstorageV1alpha1().BucketRequests(bucketRequest.Namespace).Update(ctx, bucketRequest, metav1.UpdateOptions{}); err != nil {
-		return err
-	}
 
 	bucketRequest.Status.BucketName = bucket.Name
 	bucketRequest.Status.BucketAvailable = true

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,6 @@ func (b *bucketAccessRequestListener) provisionBucketAccess(ctx context.Context,`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`controllerutil.AddFinalizer(bucketAccessRequest, finalizer)`
`153`		`- if _, err := b.bucketClient.ObjectstorageV1alpha1().BucketAccessRequests(bucketAccessRequest.Namespace).Update(ctx, bucketAccessRequest, metav1.UpdateOptions{}); err != nil {`
`154`		`- return err`
`155`		`- }`
`156`	`153`
`157`	`154`	`bucketAccessRequest.Status.BucketAccessName = bucketaccess.Name`
`158`	`155`	`bucketAccessRequest.Status.AccessGranted = true`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,6 @@ func (b *bucketRequestListener) provisionBucketRequestOperation(ctx context.Cont`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`controllerutil.AddFinalizer(bucketRequest, finalizer)`
`137`		`- if _, err := b.bucketClient.ObjectstorageV1alpha1().BucketRequests(bucketRequest.Namespace).Update(ctx, bucketRequest, metav1.UpdateOptions{}); err != nil {`
`138`		`- return err`
`139`		`- }`
`140`	`137`
`141`	`138`	`bucketRequest.Status.BucketName = bucket.Name`
`142`	`139`	`bucketRequest.Status.BucketAvailable = true`