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/09 09:53:00 UTC

[camel-k] 21/37: chore(native): Polish build kit logic

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 2bbbba1d98ed2d4a56da3cef15d575d679a4326c
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Thu Aug 26 17:19:09 2021 +0200

    chore(native): Polish build kit logic
---
 pkg/controller/integration/build_kit.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkg/controller/integration/build_kit.go b/pkg/controller/integration/build_kit.go
index 3187512..4568f4f 100644
--- a/pkg/controller/integration/build_kit.go
+++ b/pkg/controller/integration/build_kit.go
@@ -74,18 +74,15 @@ func (action *buildKitAction) Handle(ctx context.Context, integration *v1.Integr
 				integration.SetIntegrationKit(&v1.IntegrationKit{})
 				return integration, nil
 			}
-
 		}
 
 		if kit.Status.Phase == v1.IntegrationKitPhaseError {
-			integration.Status.Image = kit.Status.Image
 			integration.Status.Phase = v1.IntegrationPhaseError
 			integration.SetIntegrationKit(kit)
 			return integration, nil
 		}
 
 		if kit.Status.Phase == v1.IntegrationKitPhaseReady {
-			integration.Status.Image = kit.Status.Image
 			integration.Status.Phase = v1.IntegrationPhaseDeploying
 			integration.SetIntegrationKit(kit)
 			return integration, nil
@@ -106,8 +103,9 @@ func (action *buildKitAction) Handle(ctx context.Context, integration *v1.Integr
 
 	var integrationKit *v1.IntegrationKit
 kits:
-	for i, kit := range env.IntegrationKits {
-		for j, k := range existingKits {
+	for _, kit := range env.IntegrationKits {
+		kit := kit
+		for i, k := range existingKits {
 			match, err := action.kitMatches(&kit, &k)
 			if err != nil {
 				return nil, err
@@ -116,7 +114,7 @@ kits:
 				if integrationKit == nil ||
 					integrationKit.Status.Phase != v1.IntegrationKitPhaseReady && k.Status.Phase == v1.IntegrationKitPhaseReady ||
 					integrationKit.Status.Phase == v1.IntegrationKitPhaseReady && k.Status.Phase == v1.IntegrationKitPhaseReady && k.HasHigherPriorityThan(integrationKit) {
-					integrationKit = &existingKits[j]
+					integrationKit = &existingKits[i]
 				}
 				continue kits
 			}
@@ -125,17 +123,17 @@ kits:
 			return nil, err
 		}
 		if integrationKit == nil {
-			integrationKit = &env.IntegrationKits[i]
+			integrationKit = &kit
 		}
 	}
 
 	// Set the kit name so the next handle loop, will fall through the
 	// same path as integration with a user defined kit
+	integration.SetIntegrationKit(integrationKit)
+
 	if integrationKit.Status.Phase == v1.IntegrationKitPhaseReady {
-		integration.Status.Image = integrationKit.Status.Image
 		integration.Status.Phase = v1.IntegrationPhaseDeploying
 	}
-	integration.SetIntegrationKit(integrationKit)
 
 	return integration, nil
 }