bumped version and other changes

Signed-off-by: Jeromy Cannon <[email protected]>
hashgraph · Dec 13, 2024 · d55da6e · d55da6e
1 parent 6e1b3f9
commit d55da6e
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 53 deletions.
diff --git a/HelperTasks.yml b/HelperTasks.yml
@@ -8,7 +8,7 @@ vars:
   node_list_internal: "{{range $idx, $n := .nodes }}node{{add $n 1}},{{end}}"
   node_identifiers: "{{ .node_list_internal | trimSuffix \",\" }}"
 
-  solo_user_dir: "{{ env \"HOME\" }}/.solo"
+  solo_user_dir: "{{ .solo_home_override_dir | default (printf \"%s/.solo\" (env \"HOME\")) }}"
   solo_cache_dir: "{{ .solo_user_dir }}/cache"
   solo_logs_dir: "{{ .solo_user_dir }}/logs"
   solo_keys_dir: "{{ .solo_cache_dir }}/keys"
@@ -60,18 +60,19 @@ tasks:
         - MIRROR_RELEASE_NAME
     cmds:
       - echo "Checking variables..."
-      - echo "SOLO_NETWORK_SIZE={{ .SOLO_NETWORK_SIZE }}"
-      - echo "SOLO_CHART_VERSION={{ .SOLO_CHART_VERSION }}"
-      - echo "CONSENSUS_NODE_VERSION={{ .CONSENSUS_NODE_VERSION }}"
-      - echo "SOLO_NAMESPACE={{ .SOLO_NAMESPACE }}"
+      - echo "solo_user_dir={{ .solo_user_dir }}"
+      - echo "SOLO_HOME=${SOLO_HOME}"
+      - echo "SOLO_NETWORK_SIZE=${SOLO_NETWORK_SIZE}"
+      - echo "SOLO_CHART_VERSION=${SOLO_CHART_VERSION}"
+      - echo "CONSENSUS_NODE_VERSION=${CONSENSUS_NODE_VERSION}"
+      - echo "SOLO_NAMESPACE=${SOLO_NAMESPACE}"
       - echo "nodes={{ .nodes }}"
       - echo "node_identifiers={{ .node_identifiers }}"
-      - echo "VALUES_FLAG={{ .VALUES_FLAG }}"
-      - echo "SETTINGS_FLAG={{ .SETTINGS_FLAG }}"
-      - echo "SOLO_HOME_DIR={{ .SOLO_HOME_DIR }}"
-      - echo "LOG4J2_FLAG={{ .LOG4J2_FLAG }}"
-      - echo "APPLICATION_PROPERTIES_FLAG={{ .APPLICATION_PROPERTIES_FLAG }}"
-      - echo "LOCAL_BUILD_FLAG={{ .LOCAL_BUILD_FLAG }}"
+      - echo "VALUES_FLAG=${VALUES_FLAG}"
+      - echo "SETTINGS_FLAG=${SETTINGS_FLAG}"
+      - echo "LOG4J2_FLAG=${LOG4J2_FLAG}"
+      - echo "APPLICATION_PROPERTIES_FLAG=${APPLICATION_PROPERTIES_FLAG}"
+      - echo "LOCAL_BUILD_FLAG=${LOCAL_BUILD_FLAG}"
       - touch {{ .var_check_file }}
 
   readme:
@@ -145,29 +146,29 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node keys --gossip-keys --tls-keys --node-aliases-unparsed {{.node_identifiers}}
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node keys --gossip-keys --tls-keys --node-aliases-unparsed {{.node_identifiers}} -q
 
   solo:network:deploy:
     internal: true
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}"
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}"
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" -q
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" -q
 
   solo:network:destroy:
     internal: true
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network destroy --namespace "${SOLO_NAMESPACE}" --delete-pvcs --delete-secrets --force
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network destroy --namespace "${SOLO_NAMESPACE}" --delete-pvcs --delete-secrets --force -q
 
   solo:node:start:
     internal: true
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} {{ .CLI_ARGS }}
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q {{ .CLI_ARGS }}
       - kubectl port-forward -n "${SOLO_NAMESPACE}" svc/haproxy-node1-svc 50211:50211 &
       - task: "sleep_after_port_forward"
 
@@ -177,13 +178,13 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} {{ .CLI_ARGS }}
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q {{ .CLI_ARGS }}
 
   solo:relay:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay deploy -n "${SOLO_NAMESPACE}" -i node1
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay deploy -n "${SOLO_NAMESPACE}" -i node1 -q
       - echo "Enable port forwarding for Hedera JSON RPC Relay"
       - kubectl port-forward -n "${SOLO_NAMESPACE}" svc/relay-node1-hedera-json-rpc-relay 7546:7546 &
       - task: "sleep_after_port_forward"
@@ -194,7 +195,7 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay destroy -n "${SOLO_NAMESPACE}" -i node1
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay destroy -n "${SOLO_NAMESPACE}" -i node1 -q
 
   solo:cache:remove:
     internal: true
@@ -228,15 +229,15 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}"
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" -q
 
   cluster:destroy:
     cmds:
       - kind delete cluster --name "${SOLO_CLUSTER_NAME}"
 
   clean:port-forward:
     cmds:
-      - pkill -f "kubectl port-forward -n {{ .SOLO_NAMESPACE }}" || true
+      - pkill -f "kubectl port-forward -n {{ .SOLO_NAMESPACE }}" | grep ${UID} || true
 
   sleep_after_port_forward:
     cmds:
@@ -271,7 +272,7 @@ tasks:
       - helm list --all-namespaces | grep -qz "${SOLO_CLUSTER_RELEASE_NAME}"
     cmds:
       - export MINIO_FLAG=$(cat {{ .minio_flag }})
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG}
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- cluster setup --cluster-setup-namespace "${SOLO_CLUSTER_SETUP_NAMESPACE}" ${MINIO_FLAG} -q
 
   solo:node:addresses:
     internal: true
@@ -280,12 +281,11 @@ tasks:
 
   solo:custom:network:deploy:
     internal: true
-    dir: "{{.USER_WORKING_DIR}}"
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" ${VALUES_FLAG} ${SETTINGS_FLAG}  ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG}
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" ${LOCAL_BUILD_FLAG}
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" ${VALUES_FLAG} ${SETTINGS_FLAG}  ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} -q
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} --release-tag "${CONSENSUS_NODE_VERSION}" ${LOCAL_BUILD_FLAG} -q
 
   start:
     desc: solo node start

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -6,7 +6,7 @@ includes:
 env:
   SOLO_NETWORK_SIZE: 2
   SOLO_NAMESPACE: solo-e2e
-  SOLO_CHART_VERSION: 0.36.1
+  SOLO_CHART_VERSION: 0.36.3
   CONSENSUS_NODE_VERSION: v0.57.2
 vars:
   ip_list_template_file: "{{.ROOT_DIR}}/list-external-ips.gotemplate"
@@ -54,7 +54,7 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}"
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" -q
       - echo "Enable port forwarding for Hedera Explorer & Mirror Node Network"
       - kubectl port-forward -n "${SOLO_NAMESPACE}" svc/hedera-explorer 8080:80 &
       - kubectl port-forward svc/mirror-grpc -n "${SOLO_NAMESPACE}" 5600:5600 &
@@ -67,7 +67,7 @@ tasks:
     deps:
       - task: "init"
     cmds:
-      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node destroy --namespace "${SOLO_NAMESPACE}" --force || true
+      - SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node destroy --namespace "${SOLO_NAMESPACE}" --force -q || true
 
   destroy:
     desc: destroy relay, mirror-node, and network

diff --git a/examples/custom-network-config/Taskfile.yml b/examples/custom-network-config/Taskfile.yml
@@ -6,12 +6,12 @@ includes:
 env:
   SOLO_NETWORK_SIZE: 10
   SOLO_NAMESPACE: solo-alex-kuzmin-n4
-  SOLO_CHART_VERSION: 0.36.1
+  SOLO_CHART_VERSION: 0.36.3
   CONSENSUS_NODE_VERSION: v0.57.2
-  VALUES_FLAG: "--values-file init-containers-values.yaml"
-  SETTINGS_FLAG: "--settings-txt settings.txt"
-  SOLO_HOME: "/Users/user/.solo-{{.SOLO_NAMESPACE}}"
-  # LOG4J2_FLAG: "--log4j2-xml log4j2.xml"
-  # APPLICATION_PROPERTIES_FLAG: "--application-properties application.properties"
+  VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
+  SETTINGS_FLAG: "--settings-txt {{.USER_WORKING_DIR}}/settings.txt"
+  SOLO_HOME: "/Users/user/.solo-alex-kuzmin-n4"
+  LOG4J2_FLAG: "--log4j2-xml {{.USER_WORKING_DIR}}/log4j2.xml"
+  APPLICATION_PROPERTIES_FLAG: "--application-properties {{.USER_WORKING_DIR}}/application.properties"
   # HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
   # LOCAL_BUILD_FLAG: "--local-build \"{{.HEDERA_SERVICES_ROOT}}/hedera-node/data\""
diff --git a/examples/hashsphere-0001/Taskfile.yml b/examples/hashsphere-0001/Taskfile.yml
@@ -3,15 +3,17 @@ includes:
   main:
     taskfile: ../Taskfile.yml
     flatten: true
+vars:
+  solo_home_override_dir: "/Users/user/.solo-jeromy-20241231"
 env:
   SOLO_NETWORK_SIZE: 5
   SOLO_NAMESPACE: solo-jeromy-20241231
-  SOLO_CHART_VERSION: 0.36.1
+  SOLO_CHART_VERSION: 0.36.3
   CONSENSUS_NODE_VERSION: v0.57.2
-  VALUES_FLAG: "--values-file init-containers-values.yaml"
-  SETTINGS_FLAG: "--settings-txt settings.txt"
-  SOLO_HOME: "/Users/user/.solo-{{.SOLO_NAMESPACE}}"
-  # LOG4J2_FLAG: "--log4j2-xml log4j2.xml"
-  # APPLICATION_PROPERTIES_FLAG: "--application-properties application.properties"
+  VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
+  SETTINGS_FLAG: "--settings-txt {{.USER_WORKING_DIR}}/settings.txt"
+  SOLO_HOME: "{{.solo_home_override_dir}}"
+  # LOG4J2_FLAG: "--log4j2-xml {{.USER_WORKING_DIR}}/log4j2.xml"
+  # APPLICATION_PROPERTIES_FLAG: "--application-properties {{.USER_WORKING_DIR}}/application.properties"
   # HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
   # LOCAL_BUILD_FLAG: "--local-build \"{{.HEDERA_SERVICES_ROOT}}/hedera-node/data\""
diff --git a/examples/performance-tuning/HashSphere/Taskfile.yml b/examples/performance-tuning/HashSphere/Taskfile.yml
@@ -6,12 +6,12 @@ includes:
 env:
   SOLO_NETWORK_SIZE: 7
   SOLO_NAMESPACE: solo-perf-hashsphere
-  SOLO_CHART_VERSION: 0.36.1
+  SOLO_CHART_VERSION: 0.36.3
   CONSENSUS_NODE_VERSION: v0.57.2
-  VALUES_FLAG: "--values-file init-containers-values.yaml"
-  SETTINGS_FLAG: "--settings-txt settings.txt"
-  SOLO_HOME: "/Users/user/.solo-{{.SOLO_NAMESPACE}}"
-  # LOG4J2_FLAG: "--log4j2-xml log4j2.xml"
-  # APPLICATION_PROPERTIES_FLAG: "--application-properties application.properties"
+  VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
+  SETTINGS_FLAG: "--settings-txt {{.USER_WORKING_DIR}}/settings.txt"
+  SOLO_HOME: "/Users/user/.solo-perf-hashsphere"
+  # LOG4J2_FLAG: "--log4j2-xml {{.USER_WORKING_DIR}}/log4j2.xml"
+  # APPLICATION_PROPERTIES_FLAG: "--application-properties {{.USER_WORKING_DIR}}/application.properties"
   # HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
   # LOCAL_BUILD_FLAG: "--local-build \"{{.HEDERA_SERVICES_ROOT}}/hedera-node/data\""
diff --git a/examples/performance-tuning/Latitude/Taskfile.yml b/examples/performance-tuning/Latitude/Taskfile.yml
@@ -6,12 +6,12 @@ includes:
 env:
   SOLO_NETWORK_SIZE: 10
   SOLO_NAMESPACE: solo-perf-hashsphere-lat
-  SOLO_CHART_VERSION: 0.36.1
+  SOLO_CHART_VERSION: 0.36.3
   CONSENSUS_NODE_VERSION: v0.57.2
-  VALUES_FLAG: "--values-file init-containers-values.yaml"
-  SETTINGS_FLAG: "--settings-txt settings.txt"
-  SOLO_HOME: "/Users/user/.solo-{{.SOLO_NAMESPACE}}"
-  # LOG4J2_FLAG: "--log4j2-xml log4j2.xml"
-  # APPLICATION_PROPERTIES_FLAG: "--application-properties application.properties"
+  VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
+  SETTINGS_FLAG: "--settings-txt {{.USER_WORKING_DIR}}/settings.txt"
+  SOLO_HOME: "/Users/user/.solo-perf-hashsphere-lat"
+  # LOG4J2_FLAG: "--log4j2-xml {{.USER_WORKING_DIR}}/log4j2.xml"
+  # APPLICATION_PROPERTIES_FLAG: "--application-properties {{.USER_WORKING_DIR}}/application.properties"
   # HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
   # LOCAL_BUILD_FLAG: "--local-build \"{{.HEDERA_SERVICES_ROOT}}/hedera-node/data\""
diff --git a/list-external-ips.gotemplate b/list-external-ips.gotemplate
@@ -0,0 +1,6 @@
+{{- range .items -}}
+  {{ $name := .metadata.name }}
+  {{- range .status.loadBalancer.ingress -}}
+    {{$name}} {{": "}} {{ .ip }} {{"\n"}}
+  {{- end -}}
+{{- end -}}
diff --git a/version.ts b/version.ts
@@ -21,7 +21,7 @@
 
 export const JAVA_VERSION = '21.0.1+12';
 export const HELM_VERSION = 'v3.14.2';
-export const SOLO_CHART_VERSION = '0.36.1';
+export const SOLO_CHART_VERSION = '0.36.3';
 export const HEDERA_PLATFORM_VERSION = 'v0.57.2';
 export const MIRROR_NODE_VERSION = '0.118.1';
 export const HEDERA_EXPLORER_VERSION = '0.2.1';