Skip to content

Commit c27d1d6

Browse files
jeromy-cannonjeromy-cannon
authored
feat: update genesis-network.json to add roster entries and more (#1122)
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent bdc1873 commit c27d1d6

33 files changed

+440
-206
lines changed

‎.prettierrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"bracketSpacing": false,
33
"singleQuote": true,
44
"trailingComma": "all",
5-
"arrowParens": "avoid"
5+
"arrowParens": "avoid",
6+
"printWidth": 120
67
}

‎Taskfile.helper.yml

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ vars:
1414
solo_keys_dir: "{{ .solo_cache_dir }}/keys"
1515
solo_bin_dir: "{{ .solo_user_dir }}/bin"
1616
run_build_file:
17-
sh: (echo "/tmp/run-build-$(date +%Y%m%d%H%M%S)")
17+
sh: (echo "/tmp/${USER}-run-build-$(date +%Y%m%d%H%M%S)")
1818
var_check_file:
19-
sh: (echo "/tmp/var-check-$(date +%Y%m%d%H%M%S)")
19+
sh: (echo "/tmp/${USER}-var-check-$(date +%Y%m%d%H%M%S)")
2020
minio_flag_file:
21-
sh: (echo "/tmp/minio-flag-$(date +%Y%m%d%H%M%S)")
22-
solo_chart_file:
23-
sh: (echo "/tmp/solo-chart-$(date +%Y%m%d%H%M%S)")
24-
solo_consensus_file:
25-
sh: (echo "/tmp/solo-consensus-$(date +%Y%m%d%H%M%S)")
21+
sh: (echo "/tmp/${USER}-minio-flag-$(date +%Y%m%d%H%M%S)")
22+
solo_install_file:
23+
sh: (echo "/tmp/${USER}-solo-install-$(date +%Y%m%d%H%M%S)")
2624

2725
env:
2826
SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
@@ -75,6 +73,8 @@ tasks:
7573
- echo "LOG4J2_FLAG=${LOG4J2_FLAG}"
7674
- echo "APPLICATION_PROPERTIES_FLAG=${APPLICATION_PROPERTIES_FLAG}"
7775
- echo "LOCAL_BUILD_FLAG=${LOCAL_BUILD_FLAG}"
76+
- echo "DEBUG_NODE_ALIAS=${DEBUG_NODE_ALIAS}"
77+
- echo "SOLO_CHARTS_DIR_FLAG=${SOLO_CHARTS_DIR_FLAG}"
7878
- touch {{ .var_check_file }}
7979

8080
readme:
@@ -92,10 +92,18 @@ tasks:
9292
- echo "Use command 'task default-with-relay' to deploy the network with a relay node."
9393

9494
install:solo:
95+
silent: true
9596
internal: true
97+
status:
98+
- test -f {{ .solo_install_file }}
9699
cmds:
97-
- cd ..
100+
- |
101+
if [[ "$(ls -1 package.json)" == "" ]]; then
102+
cd ..
103+
fi
104+
pwd
98105
- npm install
106+
- touch {{ .solo_install_file }}
99107

100108
install:kubectl:darwin:
101109
internal: true
@@ -157,14 +165,16 @@ tasks:
157165
- task: "init"
158166
cmds:
159167
- |
160-
unset RELEASE_FLAG
161-
if [[ "${LOCAL_BUILD_FLAG}" == "" ]]; then
162-
export RELEASE_FLAG='--release-tag {{.CONSENSUS_NODE_VERSION}}'
168+
if [[ "${DEBUG_NODE_ALIAS}" != "" ]]; then
169+
export DEBUG_NODE_FLAG="--debug-node-alias {{ .DEBUG_NODE_ALIAS }}"
170+
fi
171+
if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
172+
export CONSENSUS_NODE_FLAG='--release-tag {{.CONSENSUS_NODE_VERSION}}'
163173
fi
164174
if [[ "${SOLO_CHART_VERSION}" != "" ]]; then
165175
export SOLO_CHART_FLAG='--solo-chart-version ${SOLO_CHART_VERSION}'
166176
fi
167-
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${RELEASE_FLAG} ${SOLO_CHART_FLAG} ${VALUES_FLAG} ${SETTINGS_FLAG} ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} ${GENESIS_THROTTLES_FLAG} -q
177+
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${SOLO_CHART_FLAG} ${VALUES_FLAG} ${SETTINGS_FLAG} ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} ${GENESIS_THROTTLES_FLAG} ${DEBUG_NODE_FLAG} ${SOLO_CHARTS_DIR_FLAG} -q
168178
- |
169179
if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
170180
export CONSENSUS_NODE_FLAG='--release-tag ${CONSENSUS_NODE_VERSION}'
@@ -183,7 +193,11 @@ tasks:
183193
deps:
184194
- task: "init"
185195
cmds:
186-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q {{ .CLI_ARGS }}
196+
- |
197+
if [[ "${DEBUG_NODE_ALIAS}" != "" ]]; then
198+
export DEBUG_NODE_FLAG="--debug-node-alias {{ .DEBUG_NODE_ALIAS }}"
199+
fi
200+
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${DEBUG_NODE_FLAG} -q {{ .CLI_ARGS }}
187201
- |
188202
if [[ "{{ .use_port_forwards }}" == "true" ]];then
189203
echo "Enable port forwarding for Hedera Node"
@@ -259,7 +273,7 @@ tasks:
259273
deps:
260274
- task: "init"
261275
cmds:
262-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" -q
276+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${SOLO_CHARTS_DIR_FLAG} -q
263277

264278
cluster:destroy:
265279
cmds:
@@ -409,8 +423,7 @@ tasks:
409423
silent: true
410424
cmds:
411425
- echo "Cleaning up temporary files..."
412-
- rm -f /tmp/run-build-*
413-
- rm -f /tmp/var-check-*
414-
- rm -f /tmp/minio-flag-*
415-
- rm -f /tmp/solo-chart-*
416-
- rm -f /tmp/solo-consensus-*
426+
- rm -f /tmp/${USER}-run-build-* || true
427+
- rm -f /tmp/${USER}-var-check-* || true
428+
- rm -f /tmp/${USER}-minio-flag-* || true
429+
- rm -f /tmp/${USER}-solo-install-* || true

‎Taskfile.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ env:
88
SOLO_NAMESPACE: solo-e2e
99
# SOLO_CHART_VERSION: 0.39.0
1010
# CONSENSUS_NODE_VERSION: v0.58.0
11+
HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
12+
# LOCAL_BUILD_FLAG: "--local-build-path {{.HEDERA_SERVICES_ROOT}}/hedera-node/data"
13+
# DEBUG_NODE_ALIAS: "node2"
14+
# SOLO_CHARTS_DIR_FLAG: "-d /Users/user/source/solo-charts/charts"
1115
vars:
1216
use_port_forwards: "true"
1317

‎examples/custom-network-config/init-containers-values.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ hedera:
99
mountPath: /data-saved
1010
nodes:
1111
- name: node1
12+
nodeId: 0
1213
accountId: 0.0.3
1314
root:
1415
resources:
@@ -19,6 +20,7 @@ hedera:
1920
cpu: 24
2021
memory: 256Gi
2122
- name: node2
23+
nodeId: 1
2224
accountId: 0.0.4
2325
root:
2426
resources:
@@ -29,6 +31,7 @@ hedera:
2931
cpu: 24
3032
memory: 256Gi
3133
- name: node3
34+
nodeId: 2
3235
accountId: 0.0.5
3336
root:
3437
resources:
@@ -39,6 +42,7 @@ hedera:
3942
cpu: 24
4043
memory: 256Gi
4144
- name: node4
45+
nodeId: 3
4246
accountId: 0.0.6
4347
root:
4448
resources:
@@ -49,6 +53,7 @@ hedera:
4953
cpu: 24
5054
memory: 256Gi
5155
- name: node5
56+
nodeId: 4
5257
accountId: 0.0.7
5358
root:
5459
resources:
@@ -59,6 +64,7 @@ hedera:
5964
cpu: 24
6065
memory: 256Gi
6166
- name: node6
67+
nodeId: 5
6268
accountId: 0.0.8
6369
root:
6470
resources:
@@ -69,6 +75,7 @@ hedera:
6975
cpu: 24
7076
memory: 256Gi
7177
- name: node7
78+
nodeId: 6
7279
accountId: 0.0.9
7380
root:
7481
resources:
@@ -79,6 +86,7 @@ hedera:
7986
cpu: 24
8087
memory: 256Gi
8188
- name: node8
89+
nodeId: 7
8290
accountId: 0.0.10
8391
root:
8492
resources:
@@ -89,6 +97,7 @@ hedera:
8997
cpu: 24
9098
memory: 256Gi
9199
- name: node9
100+
nodeId: 8
92101
accountId: 0.0.11
93102
root:
94103
resources:
@@ -99,6 +108,7 @@ hedera:
99108
cpu: 24
100109
memory: 256Gi
101110
- name: node10
111+
nodeId: 9
102112
accountId: 0.0.12
103113
root:
104114
resources:
@@ -109,8 +119,6 @@ hedera:
109119
cpu: 24
110120
memory: 256Gi
111121
defaults:
112-
envoyProxy:
113-
loadBalancerEnabled: true
114122
sidecars:
115123
recordStreamUploader:
116124
resources:

‎examples/performance-tuning/latitude/init-containers-values.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ hedera:
99
mountPath: /data-saved
1010
nodes:
1111
- name: node1
12+
nodeId: 0
1213
accountId: 0.0.3
1314
root:
1415
resources:
@@ -19,6 +20,7 @@ hedera:
1920
cpu: 24
2021
memory: 256Gi
2122
- name: node2
23+
nodeId: 1
2224
accountId: 0.0.4
2325
root:
2426
resources:
@@ -29,6 +31,7 @@ hedera:
2931
cpu: 24
3032
memory: 256Gi
3133
- name: node3
34+
nodeId: 2
3235
accountId: 0.0.5
3336
root:
3437
resources:
@@ -39,6 +42,7 @@ hedera:
3942
cpu: 24
4043
memory: 256Gi
4144
- name: node4
45+
nodeId: 3
4246
accountId: 0.0.6
4347
root:
4448
resources:
@@ -49,6 +53,7 @@ hedera:
4953
cpu: 24
5054
memory: 256Gi
5155
- name: node5
56+
nodeId: 4
5257
accountId: 0.0.7
5358
root:
5459
resources:
@@ -59,6 +64,7 @@ hedera:
5964
cpu: 24
6065
memory: 256Gi
6166
- name: node6
67+
nodeId: 5
6268
accountId: 0.0.8
6369
root:
6470
resources:
@@ -69,6 +75,7 @@ hedera:
6975
cpu: 24
7076
memory: 256Gi
7177
- name: node7
78+
nodeId: 6
7279
accountId: 0.0.9
7380
root:
7481
resources:
@@ -79,6 +86,7 @@ hedera:
7986
cpu: 24
8087
memory: 256Gi
8188
- name: node8
89+
nodeId: 7
8290
accountId: 0.0.10
8391
root:
8492
resources:
@@ -89,6 +97,7 @@ hedera:
8997
cpu: 24
9098
memory: 256Gi
9199
- name: node9
100+
nodeId: 8
92101
accountId: 0.0.11
93102
root:
94103
resources:
@@ -99,6 +108,7 @@ hedera:
99108
cpu: 24
100109
memory: 256Gi
101110
- name: node10
111+
nodeId: 9
102112
accountId: 0.0.12
103113
root:
104114
resources:
@@ -111,8 +121,6 @@ hedera:
111121
defaults:
112122
haproxy:
113123
serviceType: NodePort
114-
envoyProxy:
115-
loadBalancerEnabled: true
116124
sidecars:
117125
recordStreamUploader:
118126
resources:

‎examples/performance-tuning/solo-perf-test/init-containers-values.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ hedera:
99
mountPath: /data-saved
1010
nodes:
1111
- name: node0
12+
nodeId: 0
1213
accountId: 0.0.3
1314
root:
1415
resources:
@@ -19,6 +20,7 @@ hedera:
1920
cpu: 4
2021
memory: 31Gi
2122
- name: node1
23+
nodeId: 1
2224
accountId: 0.0.4
2325
root:
2426
resources:
@@ -29,6 +31,7 @@ hedera:
2931
cpu: 4
3032
memory: 31Gi
3133
- name: node2
34+
nodeId: 2
3235
accountId: 0.0.5
3336
root:
3437
resources:
@@ -39,6 +42,7 @@ hedera:
3942
cpu: 4
4043
memory: 31Gi
4144
- name: node3
45+
nodeId: 3
4246
accountId: 0.0.6
4347
root:
4448
resources:
@@ -49,6 +53,7 @@ hedera:
4953
cpu: 4
5054
memory: 31Gi
5155
- name: node4
56+
nodeId: 4
5257
accountId: 0.0.7
5358
root:
5459
resources:
@@ -59,6 +64,7 @@ hedera:
5964
cpu: 4
6065
memory: 31Gi
6166
- name: node5
67+
nodeId: 5
6268
accountId: 0.0.8
6369
root:
6470
resources:
@@ -69,6 +75,7 @@ hedera:
6975
cpu: 4
7076
memory: 31Gi
7177
- name: node6
78+
nodeId: 6
7279
accountId: 0.0.9
7380
root:
7481
resources:
@@ -79,8 +86,6 @@ hedera:
7986
cpu: 4
8087
memory: 31Gi
8188
defaults:
82-
envoyProxy:
83-
loadBalancerEnabled: true
8489
sidecars:
8590
recordStreamUploader:
8691
resources:

‎examples/solo-gke-test/Taskfile.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ env:
1818
HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
1919
LOCAL_BUILD_FLAG: "--local-build-path {{.HEDERA_SERVICES_ROOT}}/hedera-node/data"
2020
GENESIS_THROTTLES_FLAG: "--genesis-throttles-file {{.USER_WORKING_DIR}}/throttles.json"
21+
# SOLO_CHARTS_DIR_FLAG: "-d /Users/user/source/solo-charts/charts"

0 commit comments

Comments
 (0)