[camel-k] 02/02: chore: cleanup integration kit

[nferraro]

This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 2fc8f7e3da69ccd5bbdff980bbd8c88adc0ff22c
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Sun Jun 23 22:35:25 2019 +0200

    chore: cleanup integration kit
---
 pkg/controller/integration/deploy.go                     | 16 +++++-----------
 .../integrationkit/integrationkit_controller.go          | 11 ++++++-----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkg/controller/integration/deploy.go 
b/pkg/controller/integration/deploy.go
index e8df8b5..1d89ef2 100644
--- a/pkg/controller/integration/deploy.go
+++ b/pkg/controller/integration/deploy.go
@@ -24,7 +24,6 @@ import (
        "github.com/apache/camel-k/pkg/trait"
        "github.com/apache/camel-k/pkg/util/kubernetes"
        "github.com/pkg/errors"
-       k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // NewDeployAction create an action that handles integration deploy
@@ -45,21 +44,16 @@ func (action *deployAction) CanHandle(integration 
*v1alpha1.Integration) bool {
 }
 
 func (action *deployAction) Handle(ctx context.Context, integration 
*v1alpha1.Integration) error {
-       kitName := integration.Status.Kit
-       if kitName == "" {
+       if integration.Status.Kit == "" {
                return errors.Errorf("no kit set on integration %s", 
integration.Name)
        }
-       kit := v1alpha1.NewIntegrationKit(integration.Namespace, kitName)
-       kitKey := k8sclient.ObjectKey{
-               Namespace: integration.Namespace,
-               Name:      kitName,
-       }
 
-       if err := action.client.Get(ctx, kitKey, &kit); err != nil {
-               return errors.Wrapf(err, "unable to find integration kit %s, 
%s", kitName, err)
+       kit, err := kubernetes.GetIntegrationKit(ctx, action.client, 
integration.Status.Kit, integration.Namespace)
+       if err != nil {
+               return errors.Wrapf(err, "unable to find integration kit %s, 
%s", integration.Status.Kit, err)
        }
 
-       env, err := trait.Apply(ctx, action.client, integration, &kit)
+       env, err := trait.Apply(ctx, action.client, integration, kit)
        if err != nil {
                return err
        }
diff --git a/pkg/controller/integrationkit/integrationkit_controller.go 
b/pkg/controller/integrationkit/integrationkit_controller.go
index 0de9626..57d580a 100644
--- a/pkg/controller/integrationkit/integrationkit_controller.go
+++ b/pkg/controller/integrationkit/integrationkit_controller.go
@@ -125,9 +125,10 @@ func (r *ReconcileIntegrationKit) Reconcile(request 
reconcile.Request) (reconcil
 
        ctx := context.TODO()
 
+       var instance v1alpha1.IntegrationKit
+
        // Fetch the IntegrationKit instance
-       instance := &v1alpha1.IntegrationKit{}
-       err := r.client.Get(ctx, request.NamespacedName, instance)
+       err := r.client.Get(ctx, request.NamespacedName, &instance)
        if err != nil {
                if errors.IsNotFound(err) {
                        // Request object not found, could have been deleted 
after reconcile request.
@@ -145,13 +146,13 @@ func (r *ReconcileIntegrationKit) Reconcile(request 
reconcile.Request) (reconcil
                NewMonitorAction(),
        }
 
-       ilog := rlog.ForIntegrationKit(instance)
+       ilog := rlog.ForIntegrationKit(&instance)
        for _, a := range actionPool {
                a.InjectClient(r.client)
                a.InjectLogger(ilog)
-               if a.CanHandle(instance) {
+               if a.CanHandle(&instance) {
                        ilog.Infof("Invoking action %s", a.Name())
-                       if err := a.Handle(ctx, instance); err != nil {
+                       if err := a.Handle(ctx, &instance); err != nil {
                                if k8serrors.IsConflict(err) {
                                        ilog.Error(err, "conflict")
                                        return reconcile.Result{