Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit a052b99

Browse files
committed
More changes
1 parent ffbd20a commit a052b99

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

Diff for: container-object-storage-interface-controller/pkg/bucketclaim/bucketclaim.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package bucketclaim
33
import (
44
"context"
55

6-
"github.com/google/uuid"
76
v1 "k8s.io/api/core/v1"
87
"k8s.io/apimachinery/pkg/api/errors"
98
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -128,10 +127,10 @@ func (b *bucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
128127
return err
129128
}
130129

131-
controllerutil.AddFinalizer(bucketClaim, finalizer)
130+
// controllerutil.AddFinalizer(bucketClaim, finalizer)
132131

133132
bucketClaim.Status.BucketName = bucket.Name
134-
bucketClaim.Status.BucketAvailable = true
133+
bucketClaim.Status.BucketAvailable = false
135134
_, err = b.BucketClaims(bucketClaim.Namespace).UpdateStatus(ctx, bucketClaim, metav1.UpdateOptions{})
136135
if err != nil {
137136
return err

Diff for: container-object-storage-interface-controller/pkg/util/util.go

-14
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@ import (
3535
"k8s.io/klog/v2"
3636
)
3737

38-
var (
39-
// Error codes that the central controller will return
40-
ErrBucketAlreadyExists = errors.New("A bucket already existing that matches the bucket request")
41-
ErrInvalidBucketClass = errors.New("Cannot find bucket class with the name specified in the bucket request")
42-
ErrBucketAccessAlreadyExists = errors.New("A bucket access already existing that matches the bucket access request")
43-
ErrInvalidBucketAccessClass = errors.New("Cannot find bucket access class with the name specified in the bucket access request")
44-
ErrInvalidBucketRequest = errors.New("Invalid bucket request specified in the bucket access request")
45-
ErrInvalidBucketAccessRequest = errors.New("Invalid bucket access request specified")
46-
ErrWaitForBucketProvisioning = errors.New("Bucket instance specified in the bucket request is not available to provision bucket access")
47-
ErrBCUnavailable = errors.New("BucketClass is not available")
48-
ErrNotImplemented = errors.New("Operation Not Implemented")
49-
ErrNilConfigMap = errors.New("ConfigMap cannot be nil")
50-
)
51-
5238
func CopySS(m map[string]string) map[string]string {
5339
if m == nil {
5440
return nil

0 commit comments

Comments
 (0)