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

Removing BucketClassListener and BucketAccessClassListener #10

Merged
merged 1 commit into from
Dec 14, 2020
Merged

Removing BucketClassListener and BucketAccessClassListener #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ type ObjectStorageController struct {

// Listeners
BucketListener BucketListener
BucketClassListener BucketClassListener
BucketRequestListener BucketRequestListener
BucketAccessListener BucketAccessListener
BucketAccessClassListener BucketAccessClassListener
BucketAccessRequestListener BucketAccessRequestListener

// leader election
Expand Down Expand Up @@ -466,21 +464,6 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
}
go controllerFor("BucketRequests", &v1alpha1.BucketRequest{}, addFunc, updateFunc, deleteFunc)
}
if c.BucketClassListener != nil {
c.BucketClassListener.InitializeKubeClient(c.kubeClient)
c.BucketClassListener.InitializeBucketClient(c.bucketClient)
addFunc := func(ctx context.Context, obj interface{}) error {
return c.BucketClassListener.Add(ctx, obj.(*v1alpha1.BucketClass))
}
updateFunc := func(ctx context.Context, old interface{}, new interface{}) error {
return c.BucketClassListener.Update(ctx, old.(*v1alpha1.BucketClass), new.(*v1alpha1.BucketClass))
}
deleteFunc := func(ctx context.Context, obj interface{}) error {
return c.BucketClassListener.Delete(ctx, obj.(*v1alpha1.BucketClass))
}
go controllerFor("BucketClasses", &v1alpha1.BucketClass{}, addFunc, updateFunc, deleteFunc)
}

if c.BucketAccessListener != nil {
c.BucketAccessListener.InitializeKubeClient(c.kubeClient)
c.BucketAccessListener.InitializeBucketClient(c.bucketClient)
Expand Down Expand Up @@ -509,20 +492,6 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
}
go controllerFor("BucketAccessRequests", &v1alpha1.BucketAccessRequest{}, addFunc, updateFunc, deleteFunc)
}
if c.BucketAccessClassListener != nil {
c.BucketAccessClassListener.InitializeKubeClient(c.kubeClient)
c.BucketAccessClassListener.InitializeBucketClient(c.bucketClient)
addFunc := func(ctx context.Context, obj interface{}) error {
return c.BucketAccessClassListener.Add(ctx, obj.(*v1alpha1.BucketAccessClass))
}
updateFunc := func(ctx context.Context, old interface{}, new interface{}) error {
return c.BucketAccessClassListener.Update(ctx, old.(*v1alpha1.BucketAccessClass), new.(*v1alpha1.BucketAccessClass))
}
deleteFunc := func(ctx context.Context, obj interface{}) error {
return c.BucketAccessClassListener.Delete(ctx, obj.(*v1alpha1.BucketAccessClass))
}
go controllerFor("BucketAccessClasses", &v1alpha1.BucketAccessClass{}, addFunc, updateFunc, deleteFunc)
}

<-ctx.Done()
}
26 changes: 0 additions & 26 deletions controller/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,6 @@ func (c *ObjectStorageController) AddBucketListener(b BucketListener) {
c.BucketListener = b
}

type BucketClassListener interface {
GenericListener

Add(ctx context.Context, b *v1alpha1.BucketClass) error
Update(ctx context.Context, old *v1alpha1.BucketClass, new *v1alpha1.BucketClass) error
Delete(ctx context.Context, b *v1alpha1.BucketClass) error
}

func (c *ObjectStorageController) AddBucketClassListener(b BucketClassListener) {
c.initialized = true
c.BucketClassListener = b
}

type BucketRequestListener interface {
GenericListener

Expand All @@ -69,19 +56,6 @@ func (c *ObjectStorageController) AddBucketAccessListener(b BucketAccessListener
c.BucketAccessListener = b
}

type BucketAccessClassListener interface {
GenericListener

Add(ctx context.Context, b *v1alpha1.BucketAccessClass) error
Update(ctx context.Context, old *v1alpha1.BucketAccessClass, new *v1alpha1.BucketAccessClass) error
Delete(ctx context.Context, b *v1alpha1.BucketAccessClass) error
}

func (c *ObjectStorageController) AddBucketAccessClassListener(b BucketAccessClassListener) {
c.initialized = true
c.BucketAccessClassListener = b
}

type BucketAccessRequestListener interface {
GenericListener

Expand Down