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.

Sign up for GitHub

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

Jump to bottom

ci: change to using solo-charts repo and solo-containers repo #648

Merged
merged 7 commits into from
Oct 9, 2024
Merged

ci: change to using solo-charts repo and solo-containers repo #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ede6277
change fst full stacking to solo
JeffreyDallas Oct 3, 2024
8765498
fst to solo
JeffreyDallas Oct 4, 2024
db57d07
Merge commit '0d114004660fc6ff1477f11ac0ebb19b74ff9c3e' into test-sol…
JeffreyDallas Oct 4, 2024
da8cb01
save
JeffreyDallas Oct 4, 2024
0dbc8bb
save
JeffreyDallas Oct 4, 2024
863770d
Update examples/custom-network-config/Taskfile.yml
JeffreyDallas Oct 7, 2024
a35f342
Merge branch 'main' into 00647-D-switch-chart-repo
JeffreyDallas Oct 8, 2024
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_enhancement.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ body:
placeholder: |
_A clear and concise description of what you want to happen._

Note: Feature enhancements to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Full Stack Testing (FST) Suite aims to be vendor agnostic.
Note: Feature enhancements to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Solo Testing (Solo) Suite aims to be vendor agnostic.
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
placeholder: |
_A clear and concise description of what you want to happen._

Note: Feature requests to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Full Stack Testing (FST) Suite aims to be vendor agnostic.
Note: Feature requests to integrate vendor specific cloud tools (e.g. awscli, gcloud-sdk, azure-cli) will likely be rejected as the Solo Suite aims to be vendor agnostic.
validations:
required: true
- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/script/relay_smoke_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ solo mirror-node deploy
solo relay deploy -i node1
kubectl port-forward svc/relay-node1-hedera-json-rpc-relay -n solo-e2e 7546:7546 &
kubectl port-forward svc/haproxy-node1-svc -n solo-e2e 50211:50211 &
kubectl port-forward svc/fullstack-deployment-hedera-explorer -n solo-e2e 8080:80 &
kubectl port-forward svc/solo-deployment-hedera-explorer -n solo-e2e 8080:80 &

echo "Clone hedera local node"

Expand Down
40 changes: 15 additions & 25 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ An opinionated CLI tool to deploy and manage standalone test networks.

## Requirements

| Solo Version | Node.js | Kind | FST Chart | Hedera | Kubernetes | Kubectl | Helm | k9s | Docker Resources | Java |
| Solo Version | Node.js | Kind | Solo Chart | Hedera | Kubernetes | Kubectl | Helm | k9s | Docker Resources | Java |
|--------------|---------------------------|------------|-----------|----------|------------|------------|---------|------------|-------------------------|--------------|
| 0.29.0 | >= 20.14.0 (lts/hydrogen) | >= v1.29.1 | v0.30.0 | v0.53.0+ | >= v1.27.3 | >= v1.27.3 | v3.14.2 | >= v0.27.4 | Memory >= 8GB, CPU >= 4 | >= 21.0.1+12 |
| 0.30.0 | >= 20.14.0 (lts/hydrogen) | >= v1.29.1 | v0.30.0 | v0.54.0+ | >= v1.27.3 | >= v1.27.3 | v3.14.2 | >= v0.27.4 | Memory >= 8GB, CPU >= 4 | >= 21.0.1+12 |
Expand Down Expand Up @@ -107,8 +107,8 @@ You may now view pods in your cluster using `k9s -A` as below:
MEM: n/a
┌───────────────────────────────────────────────── Pods(all)[11] ─────────────────────────────────────────────────┐
│ NAMESPACE↑ NAME PF READY STATUS RESTARTS IP NODE │
│ fullstack-setup console-557956d575-4r5xm ● 1/1 Running 0 10.244.0.5 solo-con │
│ fullstack-setup minio-operator-7d575c5f84-8shc9 ● 1/1 Running 0 10.244.0.6 solo-con │
│ solo-setup console-557956d575-4r5xm ● 1/1 Running 0 10.244.0.5 solo-con │
│ solo-setup minio-operator-7d575c5f84-8shc9 ● 1/1 Running 0 10.244.0.6 solo-con │
│ kube-system coredns-5d78c9869d-6cfbg ● 1/1 Running 0 10.244.0.4 solo-con │
│ kube-system coredns-5d78c9869d-gxcjz ● 1/1 Running 0 10.244.0.3 solo-con │
│ kube-system etcd-solo-control-plane ● 1/1 Running 0 172.18.0.2 solo-con │
Expand Down Expand Up @@ -212,7 +212,7 @@ Kubernetes Namespace : solo
**********************************************************************************
✔ Initialize
✔ Prepare chart values
✔ Install 'fullstack-cluster-setup' chart
✔ Install 'solo-cluster-setup' chart
```

In a separate terminal, you may run `k9s` to view the pod status.
Expand Down Expand Up @@ -247,7 +247,7 @@ Kubernetes Namespace : solo
✔ Copy Gossip keys
✔ Node: node2
✔ Copy node keys to secrets
✔ Install chart 'fullstack-deployment'
✔ Install chart 'solo-deployment'
✔ Check Node: node1
✔ Check Node: node2
✔ Check Node: node3
Expand Down Expand Up @@ -411,15 +411,15 @@ Context: kind-solo <0> all <a> Attach
│ solo envoy-proxy-node1-65f8879dcc-rwg97 ● 1/1 Running 0 1 │
│ solo envoy-proxy-node2-667f848689-628cx ● 1/1 Running 0 1 │
│ solo envoy-proxy-node3-6bb4b4cbdf-dmwtr ● 1/1 Running 0 1 │
│ solo fullstack-deployment-grpc-75bb9c6c55-l7kvt ● 1/1 Running 0 1 │
│ solo fullstack-deployment-hedera-explorer-6565ccb4cb-9dbw2 ● 1/1 Running 0 1 │
│ solo fullstack-deployment-importer-dd74fd466-vs4mb ● 1/1 Running 0 1 │
│ solo fullstack-deployment-monitor-54b8f57db9-fn5qq ● 1/1 Running 0 1 │
│ solo fullstack-deployment-postgres-postgresql-0 ● 1/1 Running 0 1 │
│ solo fullstack-deployment-redis-node-0 ● 2/2 Running 0 1 │
│ solo fullstack-deployment-rest-6d48f8dbfc-plbp2 ● 1/1 Running 0 1 │
│ solo fullstack-deployment-restjava-5d6c4cb648-r597f ● 1/1 Running 0 1 │
│ solo fullstack-deployment-web3-55fdfbc7f7-lzhfl ● 1/1 Running 0 1 │
│ solo solo-deployment-grpc-75bb9c6c55-l7kvt ● 1/1 Running 0 1 │
│ solo solo-deployment-hedera-explorer-6565ccb4cb-9dbw2 ● 1/1 Running 0 1 │
│ solo solo-deployment-importer-dd74fd466-vs4mb ● 1/1 Running 0 1 │
│ solo solo-deployment-monitor-54b8f57db9-fn5qq ● 1/1 Running 0 1 │
│ solo solo-deployment-postgres-postgresql-0 ● 1/1 Running 0 1 │
│ solo solo-deployment-redis-node-0 ● 2/2 Running 0 1 │
│ solo solo-deployment-rest-6d48f8dbfc-plbp2 ● 1/1 Running 0 1 │
│ solo solo-deployment-restjava-5d6c4cb648-r597f ● 1/1 Running 0 1 │
│ solo solo-deployment-web3-55fdfbc7f7-lzhfl ● 1/1 Running 0 1 │
│ solo haproxy-node1-785b9b6f9b-676mr ● 1/1 Running 1 1 │
│ solo haproxy-node2-644b8c76d-v9mg6 ● 1/1 Running 1 1 │
│ solo haproxy-node3-fbffdb64-272t2 ● 1/1 Running 1 1 │
Expand Down Expand Up @@ -451,17 +451,7 @@ Once the nodes are up, you may now expose various services (using `k9s` (shift-f
kubectl port-forward svc/haproxy-node3-svc -n "${SOLO_NAMESPACE}" 52211:50211 &
```
* Envoy Proxy: `envoy-proxy-<node ID>-svc`
```bash
# enable portforwarding for envoy proxy
kubectl port-forward svc/envoy-proxy-node1-svc -n "${SOLO_NAMESPACE}" 8181:8080 &
kubectl port-forward svc/envoy-proxy-node2-svc -n "${SOLO_NAMESPACE}" 8281:8080 &
kubectl port-forward svc/envoy-proxy-node3-svc -n "${SOLO_NAMESPACE}" 8381:8080 &
```
* Hedera explorer: `fullstack-deployment-hedera-explorer`
```bash
#enable portforwarding for hedera explorer, can be access at http://localhost:8080/
kubectl port-forward svc/fullstack-deployment-hedera-explorer -n "${SOLO_NAMESPACE}" 8080:80 &
```
* Hedera explorer: `solo-deployment-hedera-explorer`
* JSON Rpc Relays
* You can deploy JSON RPC relays for one or more nodes as below:
```bash
Expand Down
28 changes: 14 additions & 14 deletions README.md.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ An opinionated CLI tool to deploy and manage standalone test networks.

## Requirements

| Solo Version | Node.js | Kind | FST Chart | Hedera | Kubernetes | Kubectl | Helm | k9s | Docker Resources | Java |
| Solo Version | Node.js | Kind | Solo Chart | Hedera | Kubernetes | Kubectl | Helm | k9s | Docker Resources | Java |
|--------------|---------------------------|------------|-----------|----------|------------|------------|---------|------------|-------------------------|--------------|
| 0.29.0 | >= 20.14.0 (lts/hydrogen) | >= v1.29.1 | v0.30.0 | v0.53.0+ | >= v1.27.3 | >= v1.27.3 | v3.14.2 | >= v0.27.4 | Memory >= 8GB, CPU >= 4 | >= 21.0.1+12 |
| 0.30.0 | >= 20.14.0 (lts/hydrogen) | >= v1.29.1 | v0.30.0 | v0.54.0+ | >= v1.27.3 | >= v1.27.3 | v3.14.2 | >= v0.27.4 | Memory >= 8GB, CPU >= 4 | >= 21.0.1+12 |
Expand Down Expand Up @@ -95,8 +95,8 @@ You may now view pods in your cluster using `k9s -A` as below:
MEM: n/a
┌───────────────────────────────────────────────── Pods(all)[11] ─────────────────────────────────────────────────┐
│ NAMESPACE↑ NAME PF READY STATUS RESTARTS IP NODE │
│ fullstack-setup console-557956d575-4r5xm ● 1/1 Running 0 10.244.0.5 solo-con │
│ fullstack-setup minio-operator-7d575c5f84-8shc9 ● 1/1 Running 0 10.244.0.6 solo-con │
│ solo-setup console-557956d575-4r5xm ● 1/1 Running 0 10.244.0.5 solo-con │
│ solo-setup minio-operator-7d575c5f84-8shc9 ● 1/1 Running 0 10.244.0.6 solo-con │
│ kube-system coredns-5d78c9869d-6cfbg ● 1/1 Running 0 10.244.0.4 solo-con │
│ kube-system coredns-5d78c9869d-gxcjz ● 1/1 Running 0 10.244.0.3 solo-con │
│ kube-system etcd-solo-control-plane ● 1/1 Running 0 172.18.0.2 solo-con │
Expand Down Expand Up @@ -249,15 +249,15 @@ Context: kind-solo <0> all <a> Attach
│ solo envoy-proxy-node1-65f8879dcc-rwg97 ● 1/1 Running 0 1 │
│ solo envoy-proxy-node2-667f848689-628cx ● 1/1 Running 0 1 │
│ solo envoy-proxy-node3-6bb4b4cbdf-dmwtr ● 1/1 Running 0 1 │
│ solo fullstack-deployment-grpc-75bb9c6c55-l7kvt ● 1/1 Running 0 1 │
│ solo fullstack-deployment-hedera-explorer-6565ccb4cb-9dbw2 ● 1/1 Running 0 1 │
│ solo fullstack-deployment-importer-dd74fd466-vs4mb ● 1/1 Running 0 1 │
│ solo fullstack-deployment-monitor-54b8f57db9-fn5qq ● 1/1 Running 0 1 │
│ solo fullstack-deployment-postgres-postgresql-0 ● 1/1 Running 0 1 │
│ solo fullstack-deployment-redis-node-0 ● 2/2 Running 0 1 │
│ solo fullstack-deployment-rest-6d48f8dbfc-plbp2 ● 1/1 Running 0 1 │
│ solo fullstack-deployment-restjava-5d6c4cb648-r597f ● 1/1 Running 0 1 │
│ solo fullstack-deployment-web3-55fdfbc7f7-lzhfl ● 1/1 Running 0 1 │
│ solo solo-deployment-grpc-75bb9c6c55-l7kvt ● 1/1 Running 0 1 │
│ solo solo-deployment-hedera-explorer-6565ccb4cb-9dbw2 ● 1/1 Running 0 1 │
│ solo solo-deployment-importer-dd74fd466-vs4mb ● 1/1 Running 0 1 │
│ solo solo-deployment-monitor-54b8f57db9-fn5qq ● 1/1 Running 0 1 │
│ solo solo-deployment-postgres-postgresql-0 ● 1/1 Running 0 1 │
│ solo solo-deployment-redis-node-0 ● 2/2 Running 0 1 │
│ solo solo-deployment-rest-6d48f8dbfc-plbp2 ● 1/1 Running 0 1 │
│ solo solo-deployment-restjava-5d6c4cb648-r597f ● 1/1 Running 0 1 │
│ solo solo-deployment-web3-55fdfbc7f7-lzhfl ● 1/1 Running 0 1 │
│ solo haproxy-node1-785b9b6f9b-676mr ● 1/1 Running 1 1 │
│ solo haproxy-node2-644b8c76d-v9mg6 ● 1/1 Running 1 1 │
│ solo haproxy-node3-fbffdb64-272t2 ● 1/1 Running 1 1 │
Expand Down Expand Up @@ -295,10 +295,10 @@ Once the nodes are up, you may now expose various services (using `k9s` (shift-f
kubectl port-forward svc/envoy-proxy-node2-svc -n "${SOLO_NAMESPACE}" 8281:8080 &
kubectl port-forward svc/envoy-proxy-node3-svc -n "${SOLO_NAMESPACE}" 8381:8080 &
```
* Hedera explorer: `fullstack-deployment-hedera-explorer`
* Hedera explorer: `solo-deployment-hedera-explorer`
```bash
#enable portforwarding for hedera explorer, can be access at http://localhost:8080/
kubectl port-forward svc/fullstack-deployment-hedera-explorer -n "${SOLO_NAMESPACE}" 8080:80 &
kubectl port-forward svc/solo-deployment-hedera-explorer -n "${SOLO_NAMESPACE}" 8080:80 &
```
* JSON Rpc Relays
* You can deploy JSON RPC relays for one or more nodes as below:
Expand Down
8 changes: 4 additions & 4 deletions examples/custom-network-config/Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ dotenv:
silent: false

env:
FST_CHART_VERSION: v0.30.0
SOLO_CHART_VERSION: v0.32.0
CONSENSUS_NODE_VERSION: v0.54.1
SOLO_NAMESPACE: solo-{{ env "USER" | replace "." "-" | trunc 63 }}
SOLO_CLUSTER_SETUP_NAMESPACE: fullstack-setup
SOLO_CLUSTER_SETUP_NAMESPACE: solo-setup
SOLO_NETWORK_SIZE: 7

vars:
Expand Down Expand Up @@ -104,7 +104,7 @@ tasks:
solo:network:deploy:
internal: true
cmds:
- solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --fst-chart-version "${FST_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
- solo network deploy --release-tag "${CONSENSUS_NODE_VERSION}" --solo-chart-version "${SOLO_CHART_VERSION}" --values-file {{ .solo_values_file }} --settings-txt {{ .solo_settings_file }}
- solo node setup --release-tag "${CONSENSUS_NODE_VERSION}"

solo:network:destroy:
Expand All @@ -126,7 +126,7 @@ tasks:
solo:node:addresses:
internal: true
cmds:
- kubectl get svc -n "${SOLO_NAMESPACE}" -l "fullstack.hedera.com/type=network-node-svc" --output=go-template-file={{ .ip_list_template_file }}
- kubectl get svc -n "${SOLO_NAMESPACE}" -l "solo.hedera.com/type=network-node-svc" --output=go-template-file={{ .ip_list_template_file }}

solo:cache:remove:
internal: true
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
},
"keywords": [
"solo",
"full-stack-testing",
"fullstack-network-manager"
"solo-charts",
"solo-network-manager"
],
"author": "Swirlds Labs",
"license": "Apache2.0",
Expand Down
2 changes: 1 addition & 1 deletion ruleset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">

<description>
FST custom PMD rule for Codacy analyzer
Solo custom PMD rule for Codacy analyzer
</description>


Expand Down
2 changes: 1 addition & 1 deletion src/commands/account.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export class AccountCommand extends BaseCommand {
{
title: 'Prepare for account key updates',
task: async (ctx) => {
const secrets = await self.k8.getSecretsByLabel(['fullstack.hedera.com/account-id'])
const secrets = await self.k8.getSecretsByLabel(['solo.hedera.com/account-id'])
ctx.updateSecrets = secrets.length > 0

ctx.accountsBatchedSet = self.accountManager.batchAccounts(this.systemAccounts)
Expand Down
Loading
Loading