[camel-k] branch master updated: fix(trait): kamelet spec in running phase

[nf...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new ea926bc  fix(trait): kamelet spec in running phase
ea926bc is described below

commit ea926bcd1ac465244cb4874aaaa6f8d632584787
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Apr 15 16:33:38 2021 +0200

    fix(trait): kamelet spec in running phase
    
    Fix #2218
---
 pkg/trait/kamelets.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 6344160..df437d9 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -116,16 +116,18 @@ func (t *kameletsTrait) Configure(e *Environment) (bool, error) {
 
 func (t *kameletsTrait) Apply(e *Environment) error {
 
-	if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
+	if e.IntegrationInPhase(v1.IntegrationPhaseInitialization, v1.IntegrationPhaseRunning) {
 		if err := t.addKamelets(e); err != nil {
 			return err
 		}
-		if err := t.addConfigurationSecrets(e); err != nil {
-			return err
-		}
+	}
+
+	if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
+		return t.addConfigurationSecrets(e)
 	} else if e.IntegrationInPhase(v1.IntegrationPhaseDeploying, v1.IntegrationPhaseRunning) {
 		return t.configureApplicationProperties(e)
 	}
+
 	return nil
 }