Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Separate concepts for namespace and deployment name #1231

Merged
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
541dc2b
feat: add deployment flag
Ivo-Yankov Jan 29, 2025
09dd93d
feat: add task to add deployment to localConfig
Ivo-Yankov Jan 30, 2025
d83a1cd
fix: issues with cluster connect
Ivo-Yankov Jan 30, 2025
467c965
chore: address comments
Ivo-Yankov Jan 31, 2025
ef06033
feat: add deployment flag to account subcommands
Ivo-Yankov Jan 31, 2025
9273a83
feat: add deployment flag to explorer subcommands
Ivo-Yankov Jan 31, 2025
7e60094
feat: add deployment flag to mirror-node subcommands
Ivo-Yankov Jan 31, 2025
0f0d211
feat: add deployment flag to network subcommands
Ivo-Yankov Jan 31, 2025
0ebf244
feat: add deployment flag to relay subcommands
Ivo-Yankov Jan 31, 2025
f3429cf
feat: add deployment flag to node subcommands
Ivo-Yankov Jan 31, 2025
0654aa3
Merge branch 'main' into 01194-split-deployment-and-namespace-as-two-…
Ivo-Yankov Jan 31, 2025
183f1ef
chore: temporarily disable some unit tests
Ivo-Yankov Feb 3, 2025
6c0a078
chore: fix failing tests
Ivo-Yankov Feb 3, 2025
2eb6d6d
fix: circular deps
Ivo-Yankov Feb 3, 2025
9e3fae2
fix: failing build
Ivo-Yankov Feb 3, 2025
1e2181d
fix: create test tmp localConfig file
Ivo-Yankov Feb 3, 2025
ed7c5af
fix: integration e2e
Ivo-Yankov Feb 3, 2025
8cfaf48
fix: cacheDir in e2e setup
Ivo-Yankov Feb 3, 2025
75d4850
Merge branch 'main' into 01194-split-deployment-and-namespace-as-two-…
Ivo-Yankov Feb 4, 2025
0506489
fix: update taskfile
Ivo-Yankov Feb 4, 2025
fde6884
Merge branch 'main' into 01194-split-deployment-and-namespace-as-two-…
Ivo-Yankov Feb 4, 2025
0f3b8e3
chore: resolve conflicts and fix unit tests
Ivo-Yankov Feb 4, 2025
7d6340f
chore: bugfixes
Ivo-Yankov Feb 5, 2025
403c3ea
chore: issues in e2e
Ivo-Yankov Feb 5, 2025
ea1d4fd
chore: issues in e2e
Ivo-Yankov Feb 5, 2025
5e0064c
Merge remote-tracking branch 'origin/01194-split-deployment-and-names…
Ivo-Yankov Feb 5, 2025
9f63024
Merge branch 'main' into 01194-split-deployment-and-namespace-as-two-…
Ivo-Yankov Feb 5, 2025
98c037d
chore: issues in e2e
Ivo-Yankov Feb 5, 2025
5e7355b
fix: issues in relay and mirror node e2e
Ivo-Yankov Feb 5, 2025
66f5d0b
fix: issues in standard e2e
Ivo-Yankov Feb 5, 2025
8595805
fix: e2e assert
Ivo-Yankov Feb 6, 2025
47a5cec
Merge branch 'main' into 01194-split-deployment-and-namespace-as-two-…
Ivo-Yankov Feb 6, 2025
7760fc9
fix: create deployment in task default
Ivo-Yankov Feb 6, 2025
1a4f55e
chore: try to fix task ci
Ivo-Yankov Feb 6, 2025
a12aa39
chore: try to fix task ci
Ivo-Yankov Feb 6, 2025
af2a2fc
chore: try to fix task ci
Ivo-Yankov Feb 6, 2025
b8fa28f
chore: update readme
Ivo-Yankov Feb 6, 2025
349dfa8
chore: update readme
Ivo-Yankov Feb 6, 2025
d4f901a
chore: update readme
Ivo-Yankov Feb 6, 2025
68cacbe
chore: update readme
Ivo-Yankov Feb 6, 2025
8eb795c
fix: update readme ci
Ivo-Yankov Feb 6, 2025
fce4f65
fix: update readme ci
Ivo-Yankov Feb 6, 2025
7e48ac5
fix: update readme ci
Ivo-Yankov Feb 6, 2025
11239fd
chore: update flag description
Ivo-Yankov Feb 6, 2025
a8a8c44
chore: trigger frozen CIs
Ivo-Yankov Feb 6, 2025
e136d16
Merge branch 'main' into 01194-split-deployment-and-namespace-as-two-…
Ivo-Yankov Feb 7, 2025
34f46b3
chore: address comments
Ivo-Yankov Feb 7, 2025
0467859
fix: add missing line
Ivo-Yankov Feb 7, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/script/helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ function create_test_account ()
cd solo

# create new account and extract account id
npm run solo-test -- account create -n solo-e2e --hbar-amount 100 --generate-ecdsa-key --set-alias > test.log
npm run solo-test -- account create --deployment solo-deployment --hbar-amount 100 --generate-ecdsa-key --set-alias > test.log
export OPERATOR_ID=$(grep "accountId" test.log | awk '{print $2}' | sed 's/"//g'| sed 's/,//g')
echo "OPERATOR_ID=${OPERATOR_ID}"
rm test.log

# get private key of the account
npm run solo-test -- account get -n solo-e2e --account-id ${OPERATOR_ID} --private-key > test.log
npm run solo-test -- account get --deployment solo-deployment --account-id ${OPERATOR_ID} --private-key > test.log

# retrieve the field privateKey but not privateKeyRaw
export OPERATOR_KEY=$(grep "privateKey" test.log | grep -v "privateKeyRaw" | awk '{print $2}' | sed 's/"//g'| sed 's/,//g')
export CONTRACT_TEST_KEY_ONE=0x$(grep "privateKeyRaw" test.log | awk '{print $2}' | sed 's/"//g'| sed 's/,//g')
echo "CONTRACT_TEST_KEY_ONE=${CONTRACT_TEST_KEY_ONE}"
rm test.log

npm run solo-test -- account create -n solo-e2e --hbar-amount 100 --generate-ecdsa-key --set-alias > test.log
npm run solo-test -- account create --deployment solo-deployment --hbar-amount 100 --generate-ecdsa-key --set-alias > test.log
export SECOND_KEY=$(grep "accountId" test.log | awk '{print $2}' | sed 's/"//g'| sed 's/,//g')
npm run solo-test -- account get -n solo-e2e --account-id ${SECOND_KEY} --private-key > test.log
npm run solo-test -- account get --deployment solo-deployment --account-id ${SECOND_KEY} --private-key > test.log
export CONTRACT_TEST_KEY_TWO=0x$(grep "privateKeyRaw" test.log | awk '{print $2}' | sed 's/"//g'| sed 's/,//g')
echo "CONTRACT_TEST_KEY_TWO=${CONTRACT_TEST_KEY_TWO}"
rm test.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/script/solo_smoke_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function start_background_transactions ()
# generate accounts as background traffic for two minutes
# so record stream files can be kept pushing to mirror node
cd solo
npm run solo-test -- account create -n solo-e2e --create-amount 15 > /dev/null 2>&1 &
npm run solo-test -- account create --deployment solo-deployment --create-amount 15 > /dev/null 2>&1 &
cd -
}

Expand Down Expand Up @@ -120,7 +120,7 @@ function check_importer_log()
# then call solo account init before deploy mirror and relay node
if [ "$1" == "ACCOUNT_INIT" ]; then
echo "Call solo account init"
npm run solo-test -- account init -n solo-e2e
npm run solo-test -- account init --deployment solo-deployment
fi

task solo:mirror-node
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/script/update_md.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
fi

export SOLO_NAMESPACE=solo
export SOLO_DEPLOYMENT=solo-deployment
export SOLO_CLUSTER_SETUP_NAMESPACE=solo-cluster
export SOLO_EMAIL=john@doe.com

echo "Perform the following kind and solo commands and save output to environment variables"

Expand All @@ -25,29 +27,32 @@
solo node keys --gossip-keys --tls-keys -i node1,node2,node3 | tee keys.log
export SOLO_NODE_KEY_PEM_OUTPUT=$( cat keys.log | tee test.log )

solo deployment create -n "${SOLO_NAMESPACE}" --context kind-${SOLO_CLUSTER_NAME} --email "${SOLO_EMAIL}" --deployment-clusters kind-${SOLO_CLUSTER_NAME} --deployment "${SOLO_DEPLOYMENT}" | tee deployment-create.log

Check warning on line 30 in .github/workflows/script/update_md.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

.github/workflows/script/update_md.sh#L30

Double quote to prevent globbing and word splitting.
export SOLO_DEPLOYMENT_CREATE_OUTPUT=$( cat deployment-create.log | tee test.log )

Check notice on line 31 in .github/workflows/script/update_md.sh

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

.github/workflows/script/update_md.sh#L31

Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.

solo cluster setup -s "${SOLO_CLUSTER_SETUP_NAMESPACE}" | tee cluster-setup.log
export SOLO_CLUSTER_SETUP_OUTPUT=$( cat cluster-setup.log | tee test.log )

solo network deploy -i node1,node2,node3 -n "${SOLO_NAMESPACE}" | tee network-deploy.log
solo network deploy -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}" | tee network-deploy.log
export SOLO_NETWORK_DEPLOY_OUTPUT=$( cat network-deploy.log | tee test.log )

solo node setup -i node1,node2,node3 -n "${SOLO_NAMESPACE}" | tee node-setup.log
solo node setup -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}" | tee node-setup.log
export SOLO_NODE_SETUP_OUTPUT=$( cat node-setup.log | tee test.log )

solo node start -i node1,node2,node3 -n "${SOLO_NAMESPACE}" | tee node-start.log
solo node start -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}" | tee node-start.log
export SOLO_NODE_START_OUTPUT=$( cat node-start.log | tee test.log )

solo mirror-node deploy -n "${SOLO_NAMESPACE}" | tee mirror-node-deploy.log
solo mirror-node deploy --deployment "${SOLO_DEPLOYMENT}" | tee mirror-node-deploy.log
export SOLO_MIRROR_NODE_DEPLOY_OUTPUT=$( cat mirror-node-deploy.log | tee test.log )

solo relay deploy -i node1 -n "${SOLO_NAMESPACE}" | tee relay-deploy.log
solo relay deploy -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}" | tee relay-deploy.log
export SOLO_RELAY_DEPLOY_OUTPUT=$( cat relay-deploy.log | tee test.log )

echo "Generate README.md"

envsubst '$KIND_CREATE_CLUSTER_OUTPUT,$SOLO_INIT_OUTPUT,$SOLO_NODE_KEY_PEM_OUTPUT,$SOLO_CLUSTER_SETUP_OUTPUT, \
$SOLO_NETWORK_DEPLOY_OUTPUT,$SOLO_NODE_SETUP_OUTPUT,$SOLO_NODE_START_OUTPUT,$SOLO_MIRROR_NODE_DEPLOY_OUTPUT,\
$SOLO_RELAY_DEPLOY_OUTPUT'\
$SOLO_DEPLOYMENT_CREATE_OUTPUT,$SOLO_NETWORK_DEPLOY_OUTPUT,$SOLO_NODE_SETUP_OUTPUT,$SOLO_NODE_START_OUTPUT,\
$SOLO_MIRROR_NODE_DEPLOY_OUTPUT,$SOLO_RELAY_DEPLOY_OUTPUT'\
< docs/content/User/StepByStepGuide.md.template > docs/content/User/StepByStepGuide.md

echo "Remove color codes and lines showing intermediate progress"
Expand Down
42 changes: 27 additions & 15 deletions Taskfile.helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ env:
SOLO_CLUSTER_RELEASE_NAME: solo-cluster-setup
SOLO_CLUSTER_NAME: solo-cluster
MIRROR_RELEASE_NAME: mirror
SOLO_EMAIL: john@doe.com

tasks:
init:
Expand All @@ -53,6 +54,7 @@ tasks:
- node_identifiers
- run_build_file
- SOLO_NAMESPACE
- SOLO_DEPLOYMENT
- SOLO_CLUSTER_SETUP_NAMESPACE
- SOLO_CLUSTER_RELEASE_NAME
- SOLO_NETWORK_SIZE
Expand All @@ -66,6 +68,7 @@ tasks:
- echo "SOLO_CHART_VERSION=${SOLO_CHART_VERSION}"
- echo "CONSENSUS_NODE_VERSION=${CONSENSUS_NODE_VERSION}"
- echo "SOLO_NAMESPACE=${SOLO_NAMESPACE}"
- echo "SOLO_DEPLOYMENT=${SOLO_DEPLOYMENT}"
- echo "SOLO_CLUSTER_RELEASE_NAME=${SOLO_CLUSTER_RELEASE_NAME}"
- echo "nodes={{ .nodes }}"
- echo "node_identifiers={{ .node_identifiers }}"
Expand All @@ -90,6 +93,7 @@ tasks:
- echo "This is a custom network configuration for the Hedera Hashgraph Solo network."
- echo "The network is configured to have {{ .SOLO_NETWORK_SIZE }} nodes."
- echo "The network is deployed in the namespace {{ .SOLO_NAMESPACE }}."
- echo "The local deployment name is {{ .SOLO_DEPLOYMENT }}."
- echo "The cluster is deployed in the namespace {{ .SOLO_CLUSTER_SETUP_NAMESPACE }}."
- echo "Use command 'task default' to deploy the network."
- echo "Use command 'task destroy' to destroy the network."
Expand Down Expand Up @@ -153,6 +157,14 @@ tasks:
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- init --dev

solo:deployment:create:
silent: true
internal: true
deps:
- task: "init"
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- deployment create -n {{ .SOLO_NAMESPACE }} --context kind-${SOLO_CLUSTER_NAME} --email {{ .SOLO_EMAIL }} --deployment-clusters kind-${SOLO_CLUSTER_NAME} --deployment "${SOLO_DEPLOYMENT}" --dev

solo:keys:
silent: true
internal: true
Expand Down Expand Up @@ -185,7 +197,7 @@ tasks:
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 {{.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} ${LOAD_BALANCER_FLAG} ${NETWORK_DEPLOY_EXTRA_FLAGS} -q --dev
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.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} ${LOAD_BALANCER_FLAG} ${NETWORK_DEPLOY_EXTRA_FLAGS} -q --dev
- task: "solo:node:setup"

solo:node:setup:
Expand All @@ -198,15 +210,15 @@ tasks:
if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
export CONSENSUS_NODE_FLAG='--release-tag {{.CONSENSUS_NODE_VERSION}}'
fi
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${LOCAL_BUILD_FLAG} -q --dev
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${LOCAL_BUILD_FLAG} -q --dev

solo:network:destroy:
silent: true
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 -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network destroy --deployment "${SOLO_DEPLOYMENT}" --delete-pvcs --delete-secrets --force -q --dev

solo:node:start:
silent: true
Expand All @@ -218,7 +230,7 @@ tasks:
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 {{.node_identifiers}} ${DEBUG_NODE_FLAG} -q {{ .CLI_ARGS }} --dev
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.node_identifiers}} ${DEBUG_NODE_FLAG} -q {{ .CLI_ARGS }} --dev
- |
if [[ "{{ .use_port_forwards }}" == "true" ]];then
echo "Port forwarding for Hedera Network Node: grpc:50211"
Expand All @@ -233,14 +245,14 @@ tasks:
deps:
- task: "init"
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q {{ .CLI_ARGS }} --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.node_identifiers}} -q {{ .CLI_ARGS }} --dev

solo:relay:
silent: true
deps:
- task: "init"
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay deploy -n "${SOLO_NAMESPACE}" -i node1 ${RELAY_NODE_DEPLOY_EXTRA_FLAGS} -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- relay deploy --deployment "${SOLO_DEPLOYMENT}" -i node1 ${RELAY_NODE_DEPLOY_EXTRA_FLAGS} -q --dev
- |
if [[ "{{ .use_port_forwards }}" == "true" ]];then
echo "Enable port forwarding for Hedera JSON RPC Relay"
Expand Down Expand Up @@ -287,10 +299,10 @@ tasks:

solo:freeze:restart:
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node prepare-upgrade --namespace "${SOLO_NAMESPACE}" -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node freeze-upgrade --namespace "${SOLO_NAMESPACE}" -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node prepare-upgrade --deployment "${SOLO_DEPLOYMENT}" -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node freeze-upgrade --deployment "${SOLO_DEPLOYMENT}" -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.node_identifiers}} -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.node_identifiers}} -q --dev

cluster:create:
silent: true
Expand Down Expand Up @@ -360,7 +372,7 @@ tasks:
solo:node:logs:
silent: true
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node logs --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node logs --deployment "${SOLO_DEPLOYMENT}" --node-aliases {{.node_identifiers}} -q --dev

start:
desc: solo node start
Expand Down Expand Up @@ -420,8 +432,8 @@ tasks:
deps:
- task: "init"
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" ${SOLO_CHARTS_DIR_FLAG} ${MIRROR_NODE_DEPLOY_EXTRA_FLAGS} --pinger -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer deploy --namespace "${SOLO_NAMESPACE}" -s ${SOLO_CLUSTER_SETUP_NAMESPACE} ${SOLO_CHARTS_DIR_FLAG} ${ENABLE_EXPLORER_TLS_FLAG} ${TLS_CLUSTER_ISSUER_TYPE_FLAG} -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --deployment "${SOLO_DEPLOYMENT}" ${SOLO_CHARTS_DIR_FLAG} ${MIRROR_NODE_DEPLOY_EXTRA_FLAGS} --pinger -q --dev
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer deploy --deployment "${SOLO_DEPLOYMENT}" -s ${SOLO_CLUSTER_SETUP_NAMESPACE} ${SOLO_CHARTS_DIR_FLAG} ${ENABLE_EXPLORER_TLS_FLAG} ${TLS_CLUSTER_ISSUER_TYPE_FLAG} -q --dev
- |
if [[ "{{ .use_port_forwards }}" == "true" ]];then
echo "Enable port forwarding for Hedera Explorer & Mirror Node Network"
Expand All @@ -443,8 +455,8 @@ tasks:
deps:
- task: "init"
cmds:
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node destroy --namespace "${SOLO_NAMESPACE}" --force -q --dev || true
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer destroy --namespace "${SOLO_NAMESPACE}" --force -q --dev || true
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node destroy --deployment "${SOLO_DEPLOYMENT}" --force -q --dev || true
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer destroy --deployment "${SOLO_DEPLOYMENT}" --force -q --dev || true

clean:
desc: destroy, then remove cache directory, logs directory, config, and port forwards
Expand Down
2 changes: 2 additions & 0 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ includes:
env:
SOLO_NETWORK_SIZE: 2
SOLO_NAMESPACE: solo-e2e
SOLO_DEPLOYMENT: solo-deployment
# SOLO_CHART_VERSION: 0.39.0
# CONSENSUS_NODE_VERSION: v0.58.0
HEDERA_SERVICES_ROOT: "/Users/user/source/hedera-services"
Expand Down Expand Up @@ -41,6 +42,7 @@ tasks:
- task: "solo:init"
- task: "solo:cluster:setup"
- task: "solo:keys"
- task: "solo:deployment:create"
- task: "solo:network:deploy"

destroy:
Expand Down
23 changes: 18 additions & 5 deletions docs/content/User/StepByStepGuide.md.template
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ hedera-node1.key hedera-node3.key s-private-node2.pem s-public-node2.pem
hedera-node2.crt hedera-node4.crt s-private-node3.pem s-public-node3.pem
hedera-node2.key hedera-node4.key s-private-node4.pem s-public-node4.pem
```

* Create a deployment in the specified clusters, generate RemoteConfig and LocalConfig objects.

```
solo deployment create -n "${SOLO_NAMESPACE}" --context kind-${SOLO_CLUSTER_SETUP_NAMESPACE} --email "${SOLO_EMAIL}" --deployment-clusters kind-${SOLO_CLUSTER_SETUP_NAMESPACE} --deployment "${SOLO_DEPLOYMENT}"
```

* Example output

```
$SOLO_DEPLOYMENT_CREATE_OUTPUT
```

* Setup cluster with shared components

```
Expand All @@ -120,7 +133,7 @@ It may take a while (5~15 minutes depending on your internet speed) to download
If it fails, ensure you have enough resources allocated for Docker engine and retry the command.

```
solo network deploy -i node1,node2,node3 -n "${SOLO_NAMESPACE}"
solo network deploy -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}"
```

* Example output
Expand All @@ -133,7 +146,7 @@ $SOLO_NETWORK_DEPLOY_OUTPUT
* It may take a while as it download the hedera platform code from <https://builds.hedera.com/>

```
solo node setup -i node1,node2,node3 -n "${SOLO_NAMESPACE}"
solo node setup -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}"
```

* Example output
Expand All @@ -145,7 +158,7 @@ $SOLO_NODE_SETUP_OUTPUT
* Start the nodes

```
solo node start -i node1,node2,node3 -n "${SOLO_NAMESPACE}"
solo node start -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}"
```

* Example output
Expand All @@ -157,7 +170,7 @@ $SOLO_NODE_START_OUTPUT
* Deploy mirror node

```
solo mirror-node deploy -n "${SOLO_NAMESPACE}"
solo mirror-node deploy --deployment "${SOLO_DEPLOYMENT}"
```

* Example output
Expand All @@ -169,7 +182,7 @@ $SOLO_MIRROR_NODE_DEPLOY_OUTPUT
* Deploy a JSON RPC relay

```
solo relay deploy -i node1 -n "${SOLO_NAMESPACE}"
solo relay deploy -i node1,node2,node3 --deployment "${SOLO_DEPLOYMENT}"
```

* Example output
Expand Down
1 change: 1 addition & 0 deletions examples/Taskfile.examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ tasks:
cmds:
- task: "solo:init"
- task: "solo:cluster:setup"
- task: "solo:deployment:create"
- task: "solo:keys"
- task: "solo:network:deploy"

Expand Down
1 change: 1 addition & 0 deletions examples/custom-network-config/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ includes:
env:
SOLO_NETWORK_SIZE: 10
SOLO_NAMESPACE: solo-alex-kuzmin-n4
SOLO_DEPLOYMENT: solo-deployment-alex-kuzmin-n4
# SOLO_CHART_VERSION: 0.39.0
# CONSENSUS_NODE_VERSION: v0.58.0
VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
Expand Down
1 change: 1 addition & 0 deletions examples/performance-tuning/solo-gke/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vars:
env:
SOLO_NETWORK_SIZE: 4
SOLO_NAMESPACE: solo-gke1
SOLO_DEPLOYMENT: solo-deployment-gke1
SOLO_CHART_VERSION: 0.42.3
# CONSENSUS_NODE_VERSION: v0.58.0
VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
Expand Down
1 change: 1 addition & 0 deletions examples/performance-tuning/solo-perf-test/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ includes:
env:
SOLO_NETWORK_SIZE: 7
SOLO_NAMESPACE: solo-perf-test
SOLO_DEPLOYMENT: solo-deployment-perf-test
# SOLO_CHART_VERSION: 0.39.0
# CONSENSUS_NODE_VERSION: v0.58.0
VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
Expand Down
1 change: 1 addition & 0 deletions examples/solo-gke-test/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vars:
env:
SOLO_NETWORK_SIZE: 4
SOLO_NAMESPACE: solo-gke-test
SOLO_DEPLOYMENT: solo-deployment-gke-test
# SOLO_CHART_VERSION: 0.39.0
# CONSENSUS_NODE_VERSION: v0.58.0
VALUES_FLAG: "--values-file {{.USER_WORKING_DIR}}/init-containers-values.yaml"
Expand Down
Loading
Loading