Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Change core config format to include explicit node blocks. #59

Merged
merged 10 commits into from
Aug 23, 2020
Merged

Change core config format to include explicit node blocks. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
683341c
Move nodes into qubernetes.yaml for k8s generation.
libby Aug 18, 2020
8e21540
Change variable names from all caps to lowercase.
libby Aug 21, 2020
6c26c46
Add quick-start-gen to generate a config.
libby Aug 21, 2020
ee8d537
Add support for existing config, update/regen 7nodes.
libby Aug 21, 2020
860b487
Clean up and fixes to templates.
libby Aug 21, 2020
646422a
Update config examples to new format.
libby Aug 21, 2020
dcfacd0
Update .gitignore.
libby Aug 21, 2020
df1f95b
Update testing version configs to new format.
libby Aug 21, 2020
161b8dc
Add more params to quick-start-gen.
libby Aug 21, 2020
fe66553
Update README.md
libby Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ testing/*-out
.DS_Store
docs/.DS_Store
quickest-start.yaml
quick-start.yaml
scratch/
Test/
77 changes: 35 additions & 42 deletions 7nodes/istanbul-7nodes-constellation/k8s-yaml-pvc/02-quorum-shared-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,14 @@ data:
permissioned-nodes.json: |

[
"enode://ac6b1096ca56b9f6d004b779ae3728bf83f8e22453404cc3cef16a3d9b96608bc67c4b30db88e0a5a6c6390213f7acbe1153ff6d23ce57380104288ae19373ef@%QUORUM-NODE1_SERVICE_HOST%:21000?discport=0&raftport=50401",
"enode://0ba6b9f606a43a95edc6247cdb1c1e105145817be7bcafd6b2c0ba15d58145f0dc1a194f70ba73cd6f4cdd6864edc7687f311254c7555cc32e4d45aeb1b80416@%QUORUM-NODE2_SERVICE_HOST%:21000?discport=0&raftport=50401",
"enode://579f786d4e2830bbcc02815a27e8a9bacccc9605df4dc6f20bcc1a6eb391e7225fff7cb83e5b4ecd1f3a94d8b733803f2f66b7e871961e7b029e22c155c3a778@%QUORUM-NODE3_SERVICE_HOST%:21000?discport=0&raftport=50401",
"enode://3d9ca5956b38557aba991e31cf510d4df641dce9cc26bfeb7de082f0c07abb6ede3a58410c8f249dabeecee4ad3979929ac4c7c496ad20b8cfdd061b7401b4f5@%QUORUM-NODE4_SERVICE_HOST%:21000?discport=0&raftport=50401",
"enode://3701f007bfa4cb26512d7df18e6bbd202e8484a6e11d387af6e482b525fa25542d46ff9c99db87bd419b980c24a086117a397f6d8f88e74351b41693880ea0cb@%QUORUM-NODE5_SERVICE_HOST%:21000?discport=0&raftport=50401",
"enode://eacaa74c4b0e7a9e12d2fe5fee6595eda841d6d992c35dbbcc50fcee4aa86dfbbdeff7dc7e72c2305d5a62257f82737a8cffc80474c15c611c037f52db1a3a7b@%QUORUM-NODE6_SERVICE_HOST%:21000?discport=0&raftport=50401",
"enode://239c1f044a2b03b6c4713109af036b775c5418fe4ca63b04b1ce00124af00ddab7cc088fc46020cdc783b6207efe624551be4c06a994993d8d70f684688fb7cf@%QUORUM-NODE7_SERVICE_HOST%:21000?discport=0&raftport=50401"
]

permissioned-update.sh: |
#!/bin/bash
PERM_NODE_TMPL=$(cat $QHOME/permission-nodes/permissioned-nodes.json.tmpl);
PERM_NODE_JSON=$(echo $PERM_NODE_TMPL | sed "s/%QUORUM-NODE1_SERVICE_HOST%/$QUORUM_NODE1_SERVICE_HOST/g" | sed "s/%QUORUM-NODE2_SERVICE_HOST%/$QUORUM_NODE2_SERVICE_HOST/g" | sed "s/%QUORUM-NODE3_SERVICE_HOST%/$QUORUM_NODE3_SERVICE_HOST/g" | sed "s/%QUORUM-NODE4_SERVICE_HOST%/$QUORUM_NODE4_SERVICE_HOST/g" | sed "s/%QUORUM-NODE5_SERVICE_HOST%/$QUORUM_NODE5_SERVICE_HOST/g" | sed "s/%QUORUM-NODE6_SERVICE_HOST%/$QUORUM_NODE6_SERVICE_HOST/g" | sed "s/%QUORUM-NODE7_SERVICE_HOST%/$QUORUM_NODE7_SERVICE_HOST/g" );
echo $PERM_NODE_JSON > $QUORUM_DATA_DIR/permissioned-nodes.json;
cp $QUORUM_DATA_DIR/permissioned-nodes.json $QUORUM_DATA_DIR/static-nodes.json;
"enode://ac6b1096ca56b9f6d004b779ae3728bf83f8e22453404cc3cef16a3d9b96608bc67c4b30db88e0a5a6c6390213f7acbe1153ff6d23ce57380104288ae19373ef@quorum-node1:30303?discport=0&raftport=50401",
"enode://0ba6b9f606a43a95edc6247cdb1c1e105145817be7bcafd6b2c0ba15d58145f0dc1a194f70ba73cd6f4cdd6864edc7687f311254c7555cc32e4d45aeb1b80416@quorum-node2:30303?discport=0&raftport=50401",
"enode://579f786d4e2830bbcc02815a27e8a9bacccc9605df4dc6f20bcc1a6eb391e7225fff7cb83e5b4ecd1f3a94d8b733803f2f66b7e871961e7b029e22c155c3a778@quorum-node3:30303?discport=0&raftport=50401",
"enode://3d9ca5956b38557aba991e31cf510d4df641dce9cc26bfeb7de082f0c07abb6ede3a58410c8f249dabeecee4ad3979929ac4c7c496ad20b8cfdd061b7401b4f5@quorum-node4:30303?discport=0&raftport=50401",
"enode://3701f007bfa4cb26512d7df18e6bbd202e8484a6e11d387af6e482b525fa25542d46ff9c99db87bd419b980c24a086117a397f6d8f88e74351b41693880ea0cb@quorum-node5:30303?discport=0&raftport=50401",
"enode://eacaa74c4b0e7a9e12d2fe5fee6595eda841d6d992c35dbbcc50fcee4aa86dfbbdeff7dc7e72c2305d5a62257f82737a8cffc80474c15c611c037f52db1a3a7b@quorum-node6:30303?discport=0&raftport=50401",
"enode://239c1f044a2b03b6c4713109af036b775c5418fe4ca63b04b1ce00124af00ddab7cc088fc46020cdc783b6207efe624551be4c06a994993d8d70f684688fb7cf@quorum-node7:30303?discport=0&raftport=50401"
]

---
apiVersion: v1
Expand All @@ -52,7 +45,7 @@ data:
},
"server": {
"port": 9001,
"hostName": "http://%THIS_SERVICE_HOST%",
"hostName": "http://quorum-node7",
"bindingAddress": "http://0.0.0.0:9001",
"sslConfig": {
"tls": "OFF",
Expand All @@ -74,37 +67,37 @@ data:
"peer": [

{
"url": "http://%QUORUM-NODE1_SERVICE_HOST%:9001"
"url": "http://quorum-node1:9001"
},


{
"url": "http://%QUORUM-NODE2_SERVICE_HOST%:9001"
"url": "http://quorum-node2:9001"
},


{
"url": "http://%QUORUM-NODE3_SERVICE_HOST%:9001"
"url": "http://quorum-node3:9001"
},


{
"url": "http://%QUORUM-NODE4_SERVICE_HOST%:9001"
"url": "http://quorum-node4:9001"
},


{
"url": "http://%QUORUM-NODE5_SERVICE_HOST%:9001"
"url": "http://quorum-node5:9001"
},


{
"url": "http://%QUORUM-NODE6_SERVICE_HOST%:9001"
"url": "http://quorum-node6:9001"
},


{
"url": "http://%QUORUM-NODE7_SERVICE_HOST%:9001"
"url": "http://quorum-node7:9001"
}

],
Expand Down Expand Up @@ -141,7 +134,7 @@ data:
"serverSocket":{
"type":"INET",
"port": 9080,
"hostName": "http://%THIS_SERVICE_HOST%"
"hostName": "http://quorum-node7"
},
"communicationType" : "REST"
},
Expand All @@ -160,7 +153,7 @@ data:
"serverSocket":{
"type":"INET",
"port": 9001,
"hostName": "http://%THIS_SERVICE_HOST%",
"hostName": "http://quorum-node7",
"bindingAddress": "http://0.0.0.0:9001"
},
"sslConfig": {
Expand All @@ -186,37 +179,37 @@ data:
"peer": [

{
"url": "http://%QUORUM-NODE1_SERVICE_HOST%:9001"
"url": "http://quorum-node1:9001"
},


{
"url": "http://%QUORUM-NODE2_SERVICE_HOST%:9001"
"url": "http://quorum-node2:9001"
},


{
"url": "http://%QUORUM-NODE3_SERVICE_HOST%:9001"
"url": "http://quorum-node3:9001"
},


{
"url": "http://%QUORUM-NODE4_SERVICE_HOST%:9001"
"url": "http://quorum-node4:9001"
},


{
"url": "http://%QUORUM-NODE5_SERVICE_HOST%:9001"
"url": "http://quorum-node5:9001"
},


{
"url": "http://%QUORUM-NODE6_SERVICE_HOST%:9001"
"url": "http://quorum-node6:9001"
},


{
"url": "http://%QUORUM-NODE7_SERVICE_HOST%:9001"
"url": "http://quorum-node7:9001"
}

],
Expand Down Expand Up @@ -247,7 +240,7 @@ data:
{
"app":"ThirdParty",
"enabled": true,
"serverAddress": "http://%THIS_SERVICE_HOST%:9080",
"serverAddress": "http://quorum-node7:9080",
"cors": {
"allowedMethods": [
"GET",
Expand All @@ -268,7 +261,7 @@ data:
{
"app":"P2P",
"enabled": true,
"serverAddress":"http://%THIS_SERVICE_HOST%:9001",
"serverAddress":"http://quorum-node7:9001",
"sslConfig": {
"tls": "OFF",
"generateKeyStoreIfNotExisted": true,
Expand All @@ -292,37 +285,37 @@ data:
"peer": [

{
"url": "http://%QUORUM-NODE1_SERVICE_HOST%:9001"
"url": "http://quorum-node1:9001"
},


{
"url": "http://%QUORUM-NODE2_SERVICE_HOST%:9001"
"url": "http://quorum-node2:9001"
},


{
"url": "http://%QUORUM-NODE3_SERVICE_HOST%:9001"
"url": "http://quorum-node3:9001"
},


{
"url": "http://%QUORUM-NODE4_SERVICE_HOST%:9001"
"url": "http://quorum-node4:9001"
},


{
"url": "http://%QUORUM-NODE5_SERVICE_HOST%:9001"
"url": "http://quorum-node5:9001"
},


{
"url": "http://%QUORUM-NODE6_SERVICE_HOST%:9001"
"url": "http://quorum-node6:9001"
},


{
"url": "http://%QUORUM-NODE7_SERVICE_HOST%:9001"
"url": "http://quorum-node7:9001"
}

],
Expand Down Expand Up @@ -462,6 +455,7 @@ data:



## include ibft helpers as we don't know which nodes will be running which consensus.
---
apiVersion: v1
kind: ConfigMap
Expand Down Expand Up @@ -518,7 +512,6 @@ data:
"0xb131288F355BC27090E542aE0be213c20350B767",
]


---
apiVersion: v1
kind: ConfigMap
Expand Down
56 changes: 14 additions & 42 deletions 7nodes/istanbul-7nodes-constellation/k8s-yaml-pvc/03.0-quorum-services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303

---
apiVersion: v1
Expand Down Expand Up @@ -82,12 +78,8 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303

---
apiVersion: v1
Expand Down Expand Up @@ -127,12 +119,8 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303

---
apiVersion: v1
Expand Down Expand Up @@ -172,12 +160,8 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303

---
apiVersion: v1
Expand Down Expand Up @@ -217,12 +201,8 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303

---
apiVersion: v1
Expand Down Expand Up @@ -262,12 +242,8 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303

---
apiVersion: v1
Expand Down Expand Up @@ -307,11 +283,7 @@ spec:
targetPort: 8546
- name: quorum-listener
protocol: TCP
port: 21000
targetPort: 21000
- name: raft
protocol: TCP
targetPort: 50401
port: 50401
port: 30303
targetPort: 30303


16 changes: 6 additions & 10 deletions ...s/istanbul-7nodes-constellation/k8s-yaml-pvc/deployments/01-quorum-single-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,15 @@ spec:
initialDelaySeconds: 20
periodSeconds: 3
command: [ "sh" ]
# TODO: have to generate sed files
# PERM_NODE_JSON=$(echo $PERM_NODE_TMPL | sed \"s/%QUORUM-NODE01_SERVICE_HOST%/$QUORUM_NODE01_SERVICE_HOST/g\" | sed \"s/%QUORUM-NODE02_SERVICE_HOST%/$QUORUM_NODE02_SERVICE_HOST/g\");
# sleep to give constellation some time to start up and discover the other nodes.
# --maxpeers 7
args:
- "-cx"
- "
apk add curl;
apk add jq;

sh $QHOME/permission-nodes/permissioned-update.sh;
ln -s $QUORUM_HOME/permission-nodes/permissioned-nodes.json $QUORUM_DATA_DIR/permissioned-nodes.json;
ln -s $QUORUM_HOME/permission-nodes/permissioned-nodes.json $QUORUM_DATA_DIR/static-nodes.json;

rm -r /etc/quorum/qdata/contracts-tmp;
echo what in this dir;
ls $QUORUM_DATA_DIR;
Expand Down Expand Up @@ -153,14 +151,14 @@ spec:
--rpcapi $RPC_APIS \
--wsapi $RPC_APIS \
--wsport 8546 \
--port 21000 \
--port 30303 \
\
--password $QUORUM_DATA_DIR/password.txt 2>&1 | tee -a /etc/quorum/qdata/logs/quorum.log;"
ports:
- containerPort: 50401
- containerPort: 8545
- containerPort: 8546
- containerPort: 21000
- containerPort: 30303

env:
- name: PRIVATE_CONFIG
Expand Down Expand Up @@ -217,9 +215,7 @@ spec:
name: quorum-permissioned-config
items:
- key: permissioned-nodes.json
path: permissioned-nodes.json.tmpl
- key: permissioned-update.sh
path: permissioned-update.sh
path: permissioned-nodes.json
- name: genesis-config-persistent-storage
configMap:
name: genesis-config
Expand Down
Loading