This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 96bd6ea71 fix(trait): environment variables
96bd6ea71 is described below
commit 96bd6ea7134eff973b933f60b72551790c812bdd
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu May 16 15:34:49 2024 +0200
fix(trait): environment variables
---
pkg/trait/environment.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index 677e8e043..7dda54826 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -73,12 +73,12 @@ func (t *environmentTrait) Configure(e *Environment) (bool,
*TraitCondition, err
}
func (t *environmentTrait) Apply(e *Environment) error {
- envvar.SetVal(&e.EnvVars, envVarCamelKVersion, defaults.Version)
+ envvar.SetVal(&e.EnvVars, envVarCamelKVersion,
e.Integration.Status.Version)
envvar.SetVal(&e.EnvVars, envVarOperatorID, defaults.OperatorID())
if e.Integration != nil {
envvar.SetVal(&e.EnvVars, envVarCamelKIntegration,
e.Integration.Name)
}
- envvar.SetVal(&e.EnvVars, envVarCamelKRuntimeVersion, e.RuntimeVersion)
+ envvar.SetVal(&e.EnvVars, envVarCamelKRuntimeVersion,
e.Integration.Status.RuntimeVersion)
envvar.SetVal(&e.EnvVars, envVarMountPathConfigMaps,
camel.ConfigConfigmapsMountPath)
envvar.SetVal(&e.EnvVars, envVarMountPathSecrets,
camel.ConfigSecretsMountPath)
