You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/09/27 14:31:10 UTC
[camel-k] 02/15: Fix #2553 Use SBO as a library
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 372fa9339674cdacc92fde11c42b496c4b3521bb
Author: John Poth <po...@gmail.com>
AuthorDate: Wed Sep 1 11:46:45 2021 +0200
Fix #2553 Use SBO as a library
---
pkg/trait/service_binding.go | 66 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/pkg/trait/service_binding.go b/pkg/trait/service_binding.go
index 62540b1..ca11df7 100644
--- a/pkg/trait/service_binding.go
+++ b/pkg/trait/service_binding.go
@@ -27,6 +27,12 @@ import (
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
sb "github.com/redhat-developer/service-binding-operator/api/v1alpha1"
+ "github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline"
+ "github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/builder"
+ "github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/context"
+ "github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/handler/collect"
+ "github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/handler/mapping"
+ "github.com/redhat-developer/service-binding-operator/pkg/reconcile/pipeline/handler/naming"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/util/reference"
@@ -61,6 +67,23 @@ func (t *serviceBindingTrait) Configure(e *Environment) (bool, error) {
e.IntegrationInRunningPhases(), nil
}
+func (i *impl) Process(binding interface{}) (bool, error) {
+ ctx, err := i.ctxProvider.Get(binding)
+ if err != nil {
+ return false, err
+ }
+ var status pipeline.FlowStatus
+ for _, h := range i.handlers {
+ h.Handle(ctx)
+ status = ctx.FlowStatus()
+ if status.Stop {
+ break
+ }
+ }
+
+ return status.Retry, status.Err
+}
+
func (t *serviceBindingTrait) Apply(e *Environment) error {
services, err := t.parseProvisionedServices(e)
if err != nil {
@@ -70,6 +93,49 @@ func (t *serviceBindingTrait) Apply(e *Environment) error {
if err != nil {
return err
}
+
+ var camelKFlow = []pipeline.Handler{
+ pipeline.HandlerFunc(collect.PreFlight),
+ pipeline.HandlerFunc(collect.ProvisionedService),
+ pipeline.HandlerFunc(collect.BindingDefinitions),
+ pipeline.HandlerFunc(collect.BindingItems),
+ pipeline.HandlerFunc(collect.OwnedResources),
+ pipeline.HandlerFunc(mapping.Handle),
+ pipeline.HandlerFunc(naming.Handle),
+ }
+
+ p := builder.Builder().WithHandlers(camelKFlow...).WithContextProvider(context.Provider(e.Client, context.ResourceLookup(e.Client.RESTMapper()))).Build()
+
+ serviceBindingCrd := []sb.ServiceBinding{}
+
+ for _, name := range serviceBindings {
+ if name == e.Integration.Name {
+ serviceBinding := createServiceBinding(e, services, e.Integration.Name)
+ append(serviceBindingCrd, serviceBinding)
+ } else {
+ serviceBinding, err := t.getServiceBinding(e, name)
+ // Do not throw an error if the ServiceBinding is not found and if we are managing it: we will create it
+ if err != nil {
+ return err
+ }
+ append(serviceBindingCrd, serviceBinding)
+ }
+ }
+
+ // construct Secret
+ name, secretExist := i.bindingSecretName()
+ data := i.bindingItemMap()
+ if len(data) == 0 {
+ return "", nil
+ }
+ secret := &corev1.Secret{
+ ObjectMeta: metav1.ObjectMeta{
+ Namespace: i.bindingMeta.Namespace,
+ Name: name,
+ },
+ StringData: data,
+ }
+
if len(services) > 0 {
serviceBindings = append(serviceBindings, e.Integration.Name)
}