Update 7nodes examples add tessera 7nodes.

* add 7nodes examples for tessera. * make `istanbul-7nodes-tessera` the default.
Consensys · Dec 6, 2018 · 80dd2dd · 80dd2dd
1 parent 326c78b
commit 80dd2dd
Show file tree

Hide file tree

Showing 33 changed files with 6,157 additions and 120 deletions.
diff --git a/...l-7nodes/k8s-yaml/quorum-deployments.yaml → ...ellation/k8s-yaml/quorum-deployments.yaml b/...l-7nodes/k8s-yaml/quorum-deployments.yaml → ...ellation/k8s-yaml/quorum-deployments.yaml
diff --git a/...ul-7nodes/k8s-yaml/quorum-keyconfigs.yaml → ...tellation/k8s-yaml/quorum-keyconfigs.yaml b/...ul-7nodes/k8s-yaml/quorum-keyconfigs.yaml → ...tellation/k8s-yaml/quorum-keyconfigs.yaml
diff --git a/...nbul-7nodes/k8s-yaml/quorum-services.yaml → ...nstellation/k8s-yaml/quorum-services.yaml b/...nbul-7nodes/k8s-yaml/quorum-services.yaml → ...nstellation/k8s-yaml/quorum-services.yaml
diff --git a/...7nodes/k8s-yaml/quorum-shared-config.yaml → ...lation/k8s-yaml/quorum-shared-config.yaml b/...7nodes/k8s-yaml/quorum-shared-config.yaml → ...lation/k8s-yaml/quorum-shared-config.yaml
diff --git a/...ul-7nodes/qubernetes-istanbul-7nodes.yaml → ...tellation/qubernetes-istanbul-7nodes.yaml b/...ul-7nodes/qubernetes-istanbul-7nodes.yaml → ...tellation/qubernetes-istanbul-7nodes.yaml
@@ -12,19 +12,21 @@ quorum:
   # Either full or relative paths on the machine generating the config
   Key_Dir_Base: 7nodes
   Permissioned_Nodes_File: 7nodes/permissioned-nodes.json
-  Genesis_File: 7nodes/istanbul-7nodes/istanbul-genesis.json
+  Genesis_File: 7nodes/istanbul-genesis.json
   # related to quorum containers
   quorum:
     Raft_Port: 50401
     # container images at https://hub.docker.com/u/quorumengineering/
     Quorum_Version: 2.1.1
   # related to transaction manager containers
   tm:
+    Name: constellation
     # container images at https://hub.docker.com/u/quorumengineering/
     # TODO: add support for tessera, this should hold the full container name
     #       in that case.
     Tm_Version: 0.3.2
     Port: 9001
+    Tessera_Config_Dir: 7nodes 
 
 # generic geth related options
 geth:

diff --git a/7nodes/istanbul-7nodes-tessera/k8s-yaml/quorum-deployments.yaml b/7nodes/istanbul-7nodes-tessera/k8s-yaml/quorum-deployments.yaml
diff --git a/...ft-7nodes/k8s-yaml/quorum-keyconfigs.yaml → ...s-tessera/k8s-yaml/quorum-keyconfigs.yaml b/...ft-7nodes/k8s-yaml/quorum-keyconfigs.yaml → ...s-tessera/k8s-yaml/quorum-keyconfigs.yaml
@@ -8,11 +8,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node1-constellation-key-config
+  name: quorum-node1-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node1-constellation-key-config
+    name: quorum-node1-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"Wl+xSyXVuuqzpvznOS7dOobhcn4C5auxkFRi7yLtgtA="},"type":"unlocked"}
@@ -59,11 +59,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node2-constellation-key-config
+  name: quorum-node2-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node2-constellation-key-config
+    name: quorum-node2-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"nDFwJNHSiT1gNzKBy9WJvMhmYRkW3TzFUmPsNzR6oFk="},"type":"unlocked"}
@@ -110,11 +110,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node3-constellation-key-config
+  name: quorum-node3-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node3-constellation-key-config
+    name: quorum-node3-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"tMxUVR8bX7aq/TbpVHc2QV3SN2iUuExBwefAuFsO0Lg="},"type":"unlocked"}
@@ -161,11 +161,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node4-constellation-key-config
+  name: quorum-node4-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node4-constellation-key-config
+    name: quorum-node4-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"grQjd3dBp4qFs8/5Jdq7xjz++aUx/LXAqISFyPWaCRw="},"type":"unlocked"}
@@ -212,11 +212,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node5-constellation-key-config
+  name: quorum-node5-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node5-constellation-key-config
+    name: quorum-node5-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"W8XcdJfOuxCrLcspSceNg9vh7Cwe8tXiIx5xPJ88OtQ="},"type":"unlocked"}
@@ -263,11 +263,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node6-constellation-key-config
+  name: quorum-node6-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node6-constellation-key-config
+    name: quorum-node6-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"N9wH6bG0lWOCJtSnosatAskvzkrDApdrjaWkqjDyDzE="},"type":"unlocked"}
@@ -314,11 +314,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: quorum-node7-constellation-key-config
+  name: quorum-node7-tm-key-config
   namespace: quorum-test
   labels:
     app: qubernetes
-    name: quorum-node7-constellation-key-config
+    name: quorum-node7-tm-key-config
 data:
   tm.key: |-
     {"data":{"bytes":"lesaO6EWbmL1rie1biy851BnN1QsRRDK4kWUimlK0EA="},"type":"unlocked"}

diff --git a/...raft-7nodes/k8s-yaml/quorum-services.yaml → ...des-tessera/k8s-yaml/quorum-services.yaml b/...raft-7nodes/k8s-yaml/quorum-services.yaml → ...des-tessera/k8s-yaml/quorum-services.yaml
@@ -19,11 +19,16 @@ spec:
     name: quorum-node1-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546
@@ -56,11 +61,16 @@ spec:
     name: quorum-node2-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546
@@ -93,11 +103,16 @@ spec:
     name: quorum-node3-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546
@@ -130,11 +145,16 @@ spec:
     name: quorum-node4-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546
@@ -167,11 +187,16 @@ spec:
     name: quorum-node5-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546
@@ -204,11 +229,16 @@ spec:
     name: quorum-node6-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546
@@ -241,11 +271,16 @@ spec:
     name: quorum-node7-deployment
   type: ClusterIP
   ports:
-    - name: constellation
+    - name: tm-manager 
       protocol: TCP
       port: 9001
       targetPort: 9001
     # default 8545
+    - name: tm-tessera-third-part
+      protocol: TCP
+      port: 9080
+      targetPort: 9080
+    # default 8545
     - name: wsrpc-listener
       protocol: TCP
       port: 8546