You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/07/02 12:24:31 UTC

[camel-k] 11/12: refactor(controller): simplify integration kit controller

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

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

commit 01266d4694e72e36eb09969a94618a42d01e9e44
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Mon Jul 1 10:10:22 2019 +0200

    refactor(controller): simplify integration kit controller
---
 pkg/controller/integration/deploy.go        |  2 +-
 pkg/controller/integration/initialize.go    |  4 ++--
 pkg/controller/integrationkit/initialize.go | 24 +-----------------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/pkg/controller/integration/deploy.go b/pkg/controller/integration/deploy.go
index 85eda58..36c43ec 100644
--- a/pkg/controller/integration/deploy.go
+++ b/pkg/controller/integration/deploy.go
@@ -54,7 +54,7 @@ func (action *deployAction) Handle(ctx context.Context, integration *v1alpha1.In
 	}
 
 	if _, err := trait.Apply(ctx, action.client, integration, kit); err != nil {
-		return err
+		return nil, err
 	}
 
 	target := integration.DeepCopy()
diff --git a/pkg/controller/integration/initialize.go b/pkg/controller/integration/initialize.go
index 54369bd..8fed1e8 100644
--- a/pkg/controller/integration/initialize.go
+++ b/pkg/controller/integration/initialize.go
@@ -77,8 +77,8 @@ func (action *initializeAction) Handle(ctx context.Context, integration *v1alpha
 	// higher level controller (e.g. Knative source controller)
 
 	// execute custom initialization
-	if _, err := trait.Apply(ctx, action.client, target, nil); err != nil {
-		return err
+	if _, err := trait.Apply(ctx, action.client, integration, nil); err != nil {
+		return nil, err
 	}
 
 	integration.Status.Phase = v1alpha1.IntegrationPhaseBuildingKit
diff --git a/pkg/controller/integrationkit/initialize.go b/pkg/controller/integrationkit/initialize.go
index 12aa9d7..405797f 100644
--- a/pkg/controller/integrationkit/initialize.go
+++ b/pkg/controller/integrationkit/initialize.go
@@ -44,34 +44,12 @@ func (action *initializeAction) CanHandle(kit *v1alpha1.IntegrationKit) bool {
 
 func (action *initializeAction) Handle(ctx context.Context, kit *v1alpha1.IntegrationKit) (*v1alpha1.IntegrationKit, error) {
 	// The integration platform needs to be initialized before starting to create kits
-	pl, err := platform.GetCurrentPlatform(ctx, action.client, kit.Namespace)
+	_, err := platform.GetCurrentPlatform(ctx, action.client, kit.Namespace)
 	if err != nil {
 		action.L.Info("Waiting for the integration platform to be initialized")
 		return nil, nil
 	}
 
-	// The integration platform needs to be ready before starting to create integrations
-	if pl.Status.Phase != v1alpha1.IntegrationPlatformPhaseReady {
-		action.L.Info("Waiting for the integration platform to be initialized")
-
-		if kit.Status.Phase != v1alpha1.IntegrationKitPhaseWaitingForPlatform {
-			kit.Status.Phase = v1alpha1.IntegrationKitPhaseWaitingForPlatform
-			return kit, nil
-		}
-
-		return nil, nil
-	}
-
-	//
-	// restore phase to initial phase as traits are not aware of
-	// WaitingForPlatform phase
-	//
-	if kit.Status.Phase == v1alpha1.IntegrationKitPhaseWaitingForPlatform {
-		kit.Status.Phase = v1alpha1.IntegrationKitPhaseInitial
-
-		return kit, nil
-	}
-
 	_, err = trait.Apply(ctx, action.client, nil, kit)
 	if err != nil {
 		return nil, err