This repository has been archived by the owner on Sep 15, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 21
Sustain service broker #76
Merged
piotrmiskiewicz
merged 10 commits into
SAP-archive:master
from
piotrmiskiewicz:sustain-service-broker
Jan 3, 2020
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4630bd6
wip
piotrmiskiewicz a817ac7
wip
piotrmiskiewicz aaad885
wip
piotrmiskiewicz 81af4d3
wip
piotrmiskiewicz 2536c81
wip
piotrmiskiewicz d8739eb
wip
piotrmiskiewicz ec4c193
wip
piotrmiskiewicz 293a3e4
wip
piotrmiskiewicz 8739607
wip
piotrmiskiewicz 2e28cfa
wip
piotrmiskiewicz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1" | ||
| "github.com/kyma-project/helm-broker/internal/controller/broker" | ||
| "github.com/kyma-project/helm-broker/pkg/apis/addons/v1alpha1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/controller" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
| ) | ||
|
|
||
| // BrokerController is a controller which reacts on changes for ServiceInstance, ServiceBroker and AddonsConfiguration. | ||
| // Only this controller should create/delete ServiceBroker. | ||
| type BrokerController struct { | ||
| instanceChecker instanceChecker | ||
| cli client.Client | ||
|
|
||
| namespacedBrokerFacade brokerFacade | ||
| } | ||
|
|
||
| var createDeletePredicate = predicate.Funcs{ | ||
| CreateFunc: func(_ event.CreateEvent) bool { return true }, | ||
| DeleteFunc: func(_ event.DeleteEvent) bool { return true }, | ||
| UpdateFunc: func(_ event.UpdateEvent) bool { return false }, | ||
| } | ||
|
|
||
| var eventHandler = &handler.EnqueueRequestsFromMapFunc{ | ||
| ToRequests: handler.ToRequestsFunc( | ||
| func(mp handler.MapObject) []reconcile.Request { | ||
| return []reconcile.Request{{NamespacedName: types.NamespacedName{Namespace: mp.Meta.GetNamespace()}}} | ||
| }, | ||
| )} | ||
|
|
||
| // NewBrokerController creates BrokerController instance. | ||
| func NewBrokerController(checker instanceChecker, cli client.Client, bFacade brokerFacade) *BrokerController { | ||
| return &BrokerController{ | ||
| instanceChecker: checker, | ||
| cli: cli, | ||
| namespacedBrokerFacade: bFacade, | ||
| } | ||
| } | ||
|
|
||
| // Start starts the controller | ||
| func (sbc *BrokerController) Start(mgr manager.Manager) error { | ||
| // Create a new controller | ||
| c, err := controller.New("broker-controller", mgr, controller.Options{Reconciler: sbc}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Watch for changes to ServiceInstance | ||
| err = c.Watch(&source.Kind{Type: &v1beta1.ServiceInstance{}}, eventHandler, createDeletePredicate) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = c.Watch(&source.Kind{Type: &v1alpha1.AddonsConfiguration{}}, eventHandler, createDeletePredicate) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = c.Watch(&source.Kind{Type: &v1beta1.ServiceBroker{}}, eventHandler, predicate.Funcs{ | ||
| CreateFunc: func(e event.CreateEvent) bool { return e.Meta.GetName() == broker.NamespacedBrokerName }, | ||
| DeleteFunc: func(e event.DeleteEvent) bool { return e.Meta.GetName() == broker.NamespacedBrokerName }, | ||
| UpdateFunc: func(_ event.UpdateEvent) bool { return false }, | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // Reconcile checks if the (cluster) service broker must be removed | ||
| func (sbc *BrokerController) Reconcile(request reconcile.Request) (reconcile.Result, error) { | ||
| currentNamespace := request.Namespace | ||
|
|
||
| sbc.namespacedBrokerFacade.SetNamespace(request.Namespace) | ||
| sbExists, err := sbc.namespacedBrokerFacade.Exist() | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| // list addons configurations | ||
| acList := v1alpha1.AddonsConfigurationList{} | ||
| err = sbc.cli.List(context.TODO(), &client.ListOptions{Namespace: currentNamespace}, &acList) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| anyNamespacedConfigExists := len(acList.Items) > 0 | ||
|
|
||
| instanceByNamespacedExists, err := sbc.instanceChecker.AnyServiceInstanceExistsForNamespacedServiceBroker(currentNamespace) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| if sbExists && !anyNamespacedConfigExists && !instanceByNamespacedExists { | ||
| sbc.namespacedBrokerFacade.Delete() | ||
| } | ||
| if !sbExists && (anyNamespacedConfigExists || instanceByNamespacedExists) { | ||
| sbc.namespacedBrokerFacade.Create() | ||
| } | ||
|
|
||
| return reconcile.Result{}, nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why here is permanent name
helm-brokerand cluster is set by configuration?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the name of the namesaces ServiceBroker is set as a constant in the code. The ClusterServiceBroker is configurable