You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2019/12/13 08:23:13 UTC
[camel-k] 02/02: Update lra-coordinator to 5.9.4.Final by including
the fix of JBTM-3118 Add the lra-coordiantor-kub.yaml to use for create the
lra-coordinator on kubernetes
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 91313a3aa8584b1d53795f80dfef77610c88df13
Author: Amos Feng <zf...@redhat.com>
AuthorDate: Thu Dec 12 20:52:54 2019 +0800
Update lra-coordinator to 5.9.4.Final by including the fix of JBTM-3118
Add the lra-coordiantor-kub.yaml to use for create the lra-coordinator
on kubernetes
---
examples/saga/Readme.md | 8 +++--
...a-coordinator.yaml => lra-coordinator-kub.yaml} | 40 +++-------------------
examples/saga/lra-coordinator.yaml | 8 ++---
3 files changed, 15 insertions(+), 41 deletions(-)
diff --git a/examples/saga/Readme.md b/examples/saga/Readme.md
index 275524f..5856c85 100644
--- a/examples/saga/Readme.md
+++ b/examples/saga/Readme.md
@@ -1,10 +1,14 @@
# Saga example
This example is from [camel-saga-quickstart](https://github.com/nicolaferraro/camel-saga-quickstart/) and could work with the camel-k.
-* Start the lra-coordinator
+* Start the lra-coordinator by using the openshift
```
oc create -f lra-coordinator.yaml
```
+* Or start the lra-coordinator by using the kubernetes
+```
+kubectl create -f lra-coordiantor-kub.yaml
+```
* Start the three demo services
```
kamel run -t container.service-port=8080 --dependency=camel-rest --dependency=camel-undertow --dependency=camel-lra examples/saga/Flight.java
@@ -15,4 +19,4 @@ kamel run -t container.service-port=8080 --dependency=camel-rest --dependency=ca
```
kamel run -t container.service-port=8080 --dependency=camel-rest --dependency=camel-undertow --dependency=camel-lra examples/saga/Saga.java
```
-Then you can use ```kamel log saga``` to check the output of the transactions.
\ No newline at end of file
+Then you can use ```kamel log saga``` to check the output of the transactions.
diff --git a/examples/saga/lra-coordinator.yaml b/examples/saga/lra-coordinator-kub.yaml
similarity index 66%
copy from examples/saga/lra-coordinator.yaml
copy to examples/saga/lra-coordinator-kub.yaml
index 328879e..c854fc2 100644
--- a/examples/saga/lra-coordinator.yaml
+++ b/examples/saga/lra-coordinator-kub.yaml
@@ -16,7 +16,6 @@ items:
targetPort: 8080
selector:
app: lra-coordinator
- deploymentconfig: lra-coordinator
type: ClusterIP
- apiVersion: v1
kind: PersistentVolumeClaim
@@ -31,27 +30,8 @@ items:
resources:
requests:
storage: 200Mi
-- apiVersion: v1
- kind: ImageStream
- metadata:
- labels:
- app: lra-coordinator
- template: lra-coordinator
- name: lra-coordinator
- spec:
- lookupPolicy:
- local: true
- tags:
- - from:
- kind: DockerImage
- name: docker.io/jbosstm/lra-coordinator:5.8.2.Final
- generation: 0
- importPolicy: {}
- name: "5.8.2.Final"
- referencePolicy:
- type: Source
-- apiVersion: v1
- kind: DeploymentConfig
+- apiVersion: apps/v1
+ kind: Deployment
metadata:
generation: 1
labels:
@@ -61,15 +41,14 @@ items:
spec:
replicas: 1
selector:
- app: lra-coordinator
- deploymentconfig: lra-coordinator
+ matchLabels:
+ app: lra-coordinator
strategy:
type: Recreate
template:
metadata:
labels:
app: lra-coordinator
- deploymentconfig: lra-coordinator
spec:
containers:
- imagePullPolicy: IfNotPresent
@@ -83,6 +62,7 @@ items:
scheme: HTTP
initialDelaySeconds: 180
name: lra-coordinator
+ image: docker.io/jbosstm/lra-coordinator:5.9.4.Final
ports:
- containerPort: 8080
protocol: TCP
@@ -99,13 +79,3 @@ items:
- name: lra-coordinator-data
persistentVolumeClaim:
claimName: lra-coordinator
- triggers:
- - type: ConfigChange
- - imageChangeParams:
- automatic: true
- containerNames:
- - lra-coordinator
- from:
- kind: ImageStreamTag
- name: "lra-coordinator:5.8.2.Final"
- type: ImageChange
\ No newline at end of file
diff --git a/examples/saga/lra-coordinator.yaml b/examples/saga/lra-coordinator.yaml
index 328879e..c59fe26 100644
--- a/examples/saga/lra-coordinator.yaml
+++ b/examples/saga/lra-coordinator.yaml
@@ -44,10 +44,10 @@ items:
tags:
- from:
kind: DockerImage
- name: docker.io/jbosstm/lra-coordinator:5.8.2.Final
+ name: docker.io/jbosstm/lra-coordinator:5.9.4.Final
generation: 0
importPolicy: {}
- name: "5.8.2.Final"
+ name: "5.9.4.Final"
referencePolicy:
type: Source
- apiVersion: v1
@@ -107,5 +107,5 @@ items:
- lra-coordinator
from:
kind: ImageStreamTag
- name: "lra-coordinator:5.8.2.Final"
- type: ImageChange
\ No newline at end of file
+ name: "lra-coordinator:5.9.4.Final"
+ type: ImageChange