Squashed commit of the following:

commit 2207cd4 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 20:48:04 2025 +0000 fixed issue where key wasn't populated Signed-off-by: Jeromy Cannon <[email protected]> commit 754ac73 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 20:26:41 2025 +0000 refactored to extract methods for TODO Signed-off-by: Jeromy Cannon <[email protected]> commit 214fe28 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 20:19:25 2025 +0000 moved generate network json to node setup, updated nodeId to do the -1 inside the template function, add nodeid into network service map Signed-off-by: Jeromy Cannon <[email protected]> commit 0766b0f Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 18:06:41 2025 +0000 make user specific temp files in case of multi-user machine Signed-off-by: Jeromy Cannon <[email protected]> commit aac9ba6 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 18:00:24 2025 +0000 don't fail task if rm command fails Signed-off-by: Jeromy Cannon <[email protected]> commit 26a907e Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 17:57:28 2025 +0000 only run solo install once Signed-off-by: Jeromy Cannon <[email protected]> commit 28917ca Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 17:57:00 2025 +0000 set prettierrc print width to 120 Signed-off-by: Jeromy Cannon <[email protected]> commit d1c7876 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 14:27:34 2025 +0000 Squashed commit of the following: commit 3754a27 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 13:01:53 2025 +0000 fixed sleep bug with debugger flag Signed-off-by: Jeromy Cannon <[email protected]> commit 9dcbf12 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 13:01:38 2025 +0000 add charts dir Signed-off-by: Jeromy Cannon <[email protected]> commit 2aa4a14 Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 13:01:15 2025 +0000 reverted with fixes Signed-off-by: Jeromy Cannon <[email protected]> commit 98e747d Author: Jeromy Cannon <[email protected]> Date: Tue Jan 7 13:01:05 2025 +0000 add node-id to yml files Signed-off-by: Jeromy Cannon <[email protected]> commit 268e106 Author: Jeromy Cannon <[email protected]> Date: Mon Jan 6 14:19:48 2025 +0000 remove unused imports Signed-off-by: Jeromy Cannon <[email protected]> commit 93da63a Author: Jeromy Cannon <[email protected]> Date: Fri Jan 3 22:58:39 2025 +0000 update tasks to handle debugger, also updated code for genesis-network.json Signed-off-by: Jeromy Cannon <[email protected]> commit c604fd7 Author: Jeromy Cannon <[email protected]> Date: Fri Jan 3 14:44:04 2025 +0000 changes load, but nodes don't start due to incorrect signature Signed-off-by: Jeromy Cannon <[email protected]> Signed-off-by: Jeromy Cannon <[email protected]> Signed-off-by: Jeromy Cannon <[email protected]>
hashgraph · Jan 7, 2025 · afe3119 · afe3119
1 parent 04d5806
commit afe3119
Show file tree

Hide file tree

Showing 25 changed files with 371 additions and 176 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -2,5 +2,6 @@
   "bracketSpacing": false,
   "singleQuote": true,
   "trailingComma": "all",
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "printWidth": 120
 }
diff --git a/Taskfile.helper.yml b/Taskfile.helper.yml
@@ -14,15 +14,13 @@ vars:
   solo_keys_dir: "{{ .solo_cache_dir }}/keys"
   solo_bin_dir: "{{ .solo_user_dir }}/bin"
   run_build_file:
-    sh: (echo "/tmp/run-build-$(date +%Y%m%d%H%M%S)")
+    sh: (echo "/tmp/${USER}-run-build-$(date +%Y%m%d%H%M%S)")
   var_check_file:
-    sh: (echo "/tmp/var-check-$(date +%Y%m%d%H%M%S)")
+    sh: (echo "/tmp/${USER}-var-check-$(date +%Y%m%d%H%M%S)")
   minio_flag_file:
-    sh: (echo "/tmp/minio-flag-$(date +%Y%m%d%H%M%S)")
-  solo_chart_file:
-    sh: (echo "/tmp/solo-chart-$(date +%Y%m%d%H%M%S)")
-  solo_consensus_file:
-    sh: (echo "/tmp/solo-consensus-$(date +%Y%m%d%H%M%S)")
+    sh: (echo "/tmp/${USER}-minio-flag-$(date +%Y%m%d%H%M%S)")
+  solo_install_file:
+    sh: (echo "/tmp/${USER}-solo-install-$(date +%Y%m%d%H%M%S)")
 
 env:
   SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
@@ -75,6 +73,8 @@ tasks:
       - echo "LOG4J2_FLAG=${LOG4J2_FLAG}"
       - echo "APPLICATION_PROPERTIES_FLAG=${APPLICATION_PROPERTIES_FLAG}"
       - echo "LOCAL_BUILD_FLAG=${LOCAL_BUILD_FLAG}"
+      - echo "DEBUG_NODE_ALIAS=${DEBUG_NODE_ALIAS}"
+      - echo "SOLO_CHARTS_DIR_FLAG=${SOLO_CHARTS_DIR_FLAG}"
       - touch {{ .var_check_file }}
 
   readme:
@@ -92,10 +92,18 @@ tasks:
       - echo "Use command 'task default-with-relay' to deploy the network with a relay node."
 
   install:solo:
+    silent: true
     internal: true
+    status:
+      - test -f {{ .solo_install_file }}
     cmds:
-      - cd ..
+      - |
+        if [[ "$(ls -1 package.json)" == "" ]]; then
+          cd ..
+        fi
+        pwd
       - npm install
+      - touch {{ .solo_install_file }}
 
   install:kubectl:darwin:
     internal: true
@@ -157,14 +165,16 @@ tasks:
       - task: "init"
     cmds:
       - |
-        unset RELEASE_FLAG
-        if [[ "${LOCAL_BUILD_FLAG}" == "" ]]; then
-          export RELEASE_FLAG='--release-tag {{.CONSENSUS_NODE_VERSION}}'
+        if [[ "${DEBUG_NODE_ALIAS}" != "" ]]; then
+          export DEBUG_NODE_FLAG="--debug-node-alias {{ .DEBUG_NODE_ALIAS }}"
+        fi
+        if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
+          export CONSENSUS_NODE_FLAG='--release-tag {{.CONSENSUS_NODE_VERSION}}'
         fi
         if [[ "${SOLO_CHART_VERSION}" != "" ]]; then
           export SOLO_CHART_FLAG='--solo-chart-version ${SOLO_CHART_VERSION}'
         fi
-        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
+        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
       - |
         if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
           export CONSENSUS_NODE_FLAG='--release-tag ${CONSENSUS_NODE_VERSION}'
@@ -183,7 +193,11 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q {{ .CLI_ARGS }}
+      - |
+        if [[ "${DEBUG_NODE_ALIAS}" != "" ]]; then
+          export DEBUG_NODE_FLAG="--debug-node-alias {{ .DEBUG_NODE_ALIAS }}"
+        fi
+        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 }}
       - |
         if [[ "{{ .use_port_forwards }}" == "true" ]];then
           echo "Enable port forwarding for Hedera Node"
@@ -259,7 +273,7 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" -q
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${SOLO_CHARTS_DIR_FLAG} -q
 
   cluster:destroy:
     cmds:
@@ -409,8 +423,7 @@ tasks:
     silent: true
     cmds:
       - echo "Cleaning up temporary files..."
-      - rm -f /tmp/run-build-*
-      - rm -f /tmp/var-check-*
-      - rm -f /tmp/minio-flag-*
-      - rm -f /tmp/solo-chart-*
-      - rm -f /tmp/solo-consensus-*
+      - rm -f /tmp/${USER}-run-build-* || true
+      - rm -f /tmp/${USER}-var-check-* || true
+      - rm -f /tmp/${USER}-minio-flag-* || true
+      - rm -f /tmp/${USER}-solo-install-* || true
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -8,6 +8,10 @@ env:
   SOLO_NAMESPACE: solo-e2e
   # SOLO_CHART_VERSION: 0.39.0
   # CONSENSUS_NODE_VERSION: v0.58.0
+  HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
+  # LOCAL_BUILD_FLAG: "--local-build-path {{.HEDERA_SERVICES_ROOT}}/hedera-node/data"
+  # DEBUG_NODE_ALIAS: "node2"
+  # SOLO_CHARTS_DIR_FLAG: "-d /Users/user/source/solo-charts/charts"
 vars:
   use_port_forwards: "true"
 

diff --git a/examples/custom-network-config/init-containers-values.yaml b/examples/custom-network-config/init-containers-values.yaml
@@ -9,6 +9,7 @@ hedera:
           mountPath: /data-saved
   nodes:
     - name: node1
+      nodeId: 0
       accountId: 0.0.3
       root:
         resources:
@@ -19,6 +20,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node2
+      nodeId: 1
       accountId: 0.0.4
       root:
         resources:
@@ -29,6 +31,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node3
+      nodeId: 2
       accountId: 0.0.5
       root:
         resources:
@@ -39,6 +42,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node4
+      nodeId: 3
       accountId: 0.0.6
       root:
         resources:
@@ -49,6 +53,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node5
+      nodeId: 4
       accountId: 0.0.7
       root:
         resources:
@@ -59,6 +64,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node6
+      nodeId: 5
       accountId: 0.0.8
       root:
         resources:
@@ -69,6 +75,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node7
+      nodeId: 6
       accountId: 0.0.9
       root:
         resources:
@@ -79,6 +86,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node8
+      nodeId: 7
       accountId: 0.0.10
       root:
         resources:
@@ -89,6 +97,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node9
+      nodeId: 8
       accountId: 0.0.11
       root:
         resources:
@@ -99,6 +108,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node10
+      nodeId: 9
       accountId: 0.0.12
       root:
         resources:
@@ -109,8 +119,6 @@ hedera:
             cpu: 24
             memory: 256Gi
 defaults:
-  envoyProxy:
-    loadBalancerEnabled: true
   sidecars:
     recordStreamUploader:
       resources:

diff --git a/examples/performance-tuning/latitude/init-containers-values.yaml b/examples/performance-tuning/latitude/init-containers-values.yaml
@@ -9,6 +9,7 @@ hedera:
           mountPath: /data-saved
   nodes:
     - name: node1
+      nodeId: 0
       accountId: 0.0.3
       root:
         resources:
@@ -19,6 +20,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node2
+      nodeId: 1
       accountId: 0.0.4
       root:
         resources:
@@ -29,6 +31,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node3
+      nodeId: 2
       accountId: 0.0.5
       root:
         resources:
@@ -39,6 +42,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node4
+      nodeId: 3
       accountId: 0.0.6
       root:
         resources:
@@ -49,6 +53,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node5
+      nodeId: 4
       accountId: 0.0.7
       root:
         resources:
@@ -59,6 +64,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node6
+      nodeId: 5
       accountId: 0.0.8
       root:
         resources:
@@ -69,6 +75,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node7
+      nodeId: 6
       accountId: 0.0.9
       root:
         resources:
@@ -79,6 +86,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node8
+      nodeId: 7
       accountId: 0.0.10
       root:
         resources:
@@ -89,6 +97,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node9
+      nodeId: 8
       accountId: 0.0.11
       root:
         resources:
@@ -99,6 +108,7 @@ hedera:
             cpu: 24
             memory: 256Gi
     - name: node10
+      nodeId: 9
       accountId: 0.0.12
       root:
         resources:
@@ -111,8 +121,6 @@ hedera:
 defaults:
   haproxy:
     serviceType: NodePort
-  envoyProxy:
-    loadBalancerEnabled: true
   sidecars:
     recordStreamUploader:
       resources:

diff --git a/examples/performance-tuning/solo-perf-test/init-containers-values.yaml b/examples/performance-tuning/solo-perf-test/init-containers-values.yaml
@@ -9,6 +9,7 @@ hedera:
           mountPath: /data-saved
   nodes:
     - name: node0
+      nodeId: 0
       accountId: 0.0.3
       root:
         resources:
@@ -19,6 +20,7 @@ hedera:
             cpu: 4
             memory: 31Gi
     - name: node1
+      nodeId: 1
       accountId: 0.0.4
       root:
         resources:
@@ -29,6 +31,7 @@ hedera:
             cpu: 4
             memory: 31Gi
     - name: node2
+      nodeId: 2
       accountId: 0.0.5
       root:
         resources:
@@ -39,6 +42,7 @@ hedera:
             cpu: 4
             memory: 31Gi
     - name: node3
+      nodeId: 3
       accountId: 0.0.6
       root:
         resources:
@@ -49,6 +53,7 @@ hedera:
             cpu: 4
             memory: 31Gi
     - name: node4
+      nodeId: 4
       accountId: 0.0.7
       root:
         resources:
@@ -59,6 +64,7 @@ hedera:
             cpu: 4
             memory: 31Gi
     - name: node5
+      nodeId: 5
       accountId: 0.0.8
       root:
         resources:
@@ -69,6 +75,7 @@ hedera:
             cpu: 4
             memory: 31Gi
     - name: node6
+      nodeId: 6
       accountId: 0.0.9
       root:
         resources:
@@ -79,8 +86,6 @@ hedera:
             cpu: 4
             memory: 31Gi
 defaults:
-  envoyProxy:
-    loadBalancerEnabled: true
   sidecars:
     recordStreamUploader:
       resources:

diff --git a/examples/solo-gke-test/Taskfile.yml b/examples/solo-gke-test/Taskfile.yml
@@ -18,3 +18,4 @@ env:
   HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
   LOCAL_BUILD_FLAG: "--local-build-path {{.HEDERA_SERVICES_ROOT}}/hedera-node/data"
   GENESIS_THROTTLES_FLAG: "--genesis-throttles-file {{.USER_WORKING_DIR}}/throttles.json"
+  # SOLO_CHARTS_DIR_FLAG: "-d /Users/user/source/solo-charts/charts"