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 8594c918afd1b05d59c24762961c45c19fd1f07d
Author: Nicola Ferraro <ni.ferr...@gmail.com>
AuthorDate: Tue Mar 17 14:57:01 2020 +0100
Fix #1304: improve the saga example
---
examples/saga/Flight.java | 2 --
examples/saga/Payment.java | 2 --
examples/saga/Readme.md | 4 ++--
examples/saga/Saga.java | 3 ++-
examples/saga/Train.java | 2 --
pkg/trait/environment.go | 4 ++++
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/examples/saga/Flight.java b/examples/saga/Flight.java
index f883678..24d8e0d 100644
--- a/examples/saga/Flight.java
+++ b/examples/saga/Flight.java
@@ -24,8 +24,6 @@ import org.apache.camel.Exchange;
public class Flight extends RouteBuilder {
@Override
public void configure() throws Exception {
- restConfiguration().port("8080");
-
LRASagaService service = new LRASagaService();
service.setCoordinatorUrl("http://lra-coordinator";);
service.setLocalParticipantUrl("http://flight";);
diff --git a/examples/saga/Payment.java b/examples/saga/Payment.java
index 8a6e35f..bf16966 100644
--- a/examples/saga/Payment.java
+++ b/examples/saga/Payment.java
@@ -24,8 +24,6 @@ import org.apache.camel.Exchange;
public class Payment extends RouteBuilder {
@Override
public void configure() throws Exception {
- restConfiguration().port("8080");
-
LRASagaService service = new LRASagaService();
service.setCoordinatorUrl("http://lra-coordinator";);
service.setLocalParticipantUrl("http://payment";);
diff --git a/examples/saga/Readme.md b/examples/saga/Readme.md
index 127ef99..7debc1f 100644
--- a/examples/saga/Readme.md
+++ b/examples/saga/Readme.md
@@ -15,14 +15,14 @@ kubectl apply -f lra-coordinator.yaml
* Start the three demo services
```
-kamel run -d camel-undertow -d camel-lra Payment.java
+kamel run -d camel-lra Payment.java
kamel run -d camel-lra Flight.java
kamel run -d camel-lra Train.java
```
* Start the saga application
```
-kamel run -d camel-lra -t service.auto=false Saga.java
+kamel run -d camel-lra Saga.java
```
Then you can use ```kamel logs saga``` to check the output of the transactions.
diff --git a/examples/saga/Saga.java b/examples/saga/Saga.java
index 5a97d8d..ca6a386 100644
--- a/examples/saga/Saga.java
+++ b/examples/saga/Saga.java
@@ -22,7 +22,8 @@ import org.apache.camel.Exchange;
public class Saga extends RouteBuilder {
@Override
public void configure() throws Exception {
- restConfiguration().port("8080");
+ // Enable rest binding
+ rest();
LRASagaService service = new LRASagaService();
service.setCoordinatorUrl("http://lra-coordinator";);
diff --git a/examples/saga/Train.java b/examples/saga/Train.java
index c4613d3..429df5f 100644
--- a/examples/saga/Train.java
+++ b/examples/saga/Train.java
@@ -24,8 +24,6 @@ import org.apache.camel.Exchange;
public class Train extends RouteBuilder {
@Override
public void configure() throws Exception {
- restConfiguration().port("8080");
-
LRASagaService service = new LRASagaService();
service.setCoordinatorUrl("http://lra-coordinator";);
service.setLocalParticipantUrl("http://train";);
diff --git a/pkg/trait/environment.go b/pkg/trait/environment.go
index 282d383..71c44d0 100644
--- a/pkg/trait/environment.go
+++ b/pkg/trait/environment.go
@@ -36,6 +36,7 @@ const (
envVarNamespace = "NAMESPACE"
envVarPodName = "POD_NAME"
envVarCamelKVersion = "CAMEL_K_VERSION"
+ envVarCamelKIntegration = "CAMEL_K_INTEGRATION"
envVarCamelKRuntimeVersion = "CAMEL_K_RUNTIME_VERSION"
envVarMountPathConfigMaps = "CAMEL_K_MOUNT_PATH_CONFIGMAPS"
@@ -66,6 +67,9 @@ func (t *environmentTrait) Configure(e *Environment) (bool,
error) {
func (t *environmentTrait) Apply(e *Environment) error {
envvar.SetVal(&e.EnvVars, envVarCamelKVersion, defaults.Version)
+ if e.Integration != nil {
+ envvar.SetVal(&e.EnvVars, envVarCamelKIntegration,
e.Integration.Name)
+ }
envvar.SetVal(&e.EnvVars, envVarCamelKRuntimeVersion, e.RuntimeVersion)
envvar.SetVal(&e.EnvVars, envVarMountPathConfigMaps,
ConfigMapsMountPath)
envvar.SetVal(&e.EnvVars, envVarMountPathSecrets, SecretsMountPath)
