Skip to content

Commit

Permalink
Merge commit '0ac484ddfd7d2990b251633fe6f2f216bb0b537b' into 00476-D-…
Browse files Browse the repository at this point in the history
…reduce-init-account

Signed-off-by: Jeffrey Tang <jeffrey@swirldslabs.com>

# Conflicts:
#	src/core/constants.mjs
  • Loading branch information
JeffreyDallas committed Aug 10, 2024
2 parents ae0c073 + 0ac484d commit 586998f
Show file tree
Hide file tree
Showing 10 changed files with 257 additions and 185 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/zxc-code-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ jobs:
echo "::endgroup::"
- name: Publish Snyk Reports
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
if: ${{ inputs.enable-snyk-scan && !cancelled() && !failure() }}
with:
name: Snyk Reports
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zxc-e2e-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
- name: Upload E2E Logs to GitHub
if: ${{ !cancelled() }}
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: solo-${{ inputs.npm-test-script }}.log
path: ~/.solo/logs/*
Expand All @@ -195,7 +195,7 @@ jobs:
files: "junit-${{ inputs.coverage-subdirectory }}.xml"

- name: Publish E2E Coverage Report
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
if: ${{ !cancelled() }}
with:
name: ${{ inputs.coverage-report-name }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zxc-unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ jobs:
files: "junit.xml"

- name: Publish Unit Test Coverage Report
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
if: ${{ runner.os == 'linux' && !cancelled() }}
with:
name: Unit Test Coverage Report
path: 'coverage/unit'

- name: Publish Test Reports
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
if: ${{ runner.os == 'linux' && steps.npm-deps.conclusion == 'success' && !cancelled() }}
with:
name: Test Reports
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ You can now use your cluster with:
kubectl cluster-info --context kind-solo
Thanks for using kind! 😊
Have a question, bug, or feature request? Let us know! https://kind.sigs.k8s.io/#community 🙂
```

You may now view pods in your cluster using `k9s -A` as below:
Expand Down Expand Up @@ -178,9 +178,9 @@ Kubernetes Namespace : solo
✔ Clean up temp files
✔ Generate gossip keys
✔ Backup old files
✔ TLS key for node: node2
✔ TLS key for node: node1
✔ TLS key for node: node0
✔ TLS key for node: node2
✔ Generate gRPC TLS keys
✔ Finalize
```
Expand Down Expand Up @@ -239,12 +239,12 @@ Kubernetes Namespace : solo
✔ Check Node: node1
✔ Check Node: node2
✔ Check node pods are running
✔ Check Envoy Proxy for: node1
✔ Check Envoy Proxy for: node2
✔ Check Envoy Proxy for: node1
✔ Check Envoy Proxy for: node0
✔ Check HAProxy for: node1
✔ Check HAProxy for: node2
✔ Check HAProxy for: node0
✔ Check HAProxy for: node2
✔ Check proxy pods are running
✔ Check MinIO
✔ Check auxiliary pods are ready
Expand All @@ -268,18 +268,18 @@ Kubernetes Cluster : kind-solo
Kubernetes Namespace : solo
**********************************************************************************
✔ Initialize
✔ Check network pod: node0
✔ Check network pod: node2
✔ Check network pod: node1
✔ Check network pod: node0
✔ Identify network pods
✔ Copy configuration files
✔ Copy Gossip keys to staging
✔ Copy gRPC TLS keys to staging
✔ Prepare config.txt for the network
✔ Prepare staging directory
✔ Update node: node2
✔ Update node: node1
✔ Update node: node0
✔ Update node: node1
✔ Update node: node2
✔ Fetch platform software into network nodes
✔ Copy Gossip keys
✔ Copy Gossip keys
Expand All @@ -291,10 +291,10 @@ Kubernetes Namespace : solo
✔ Copy configuration files
✔ Copy configuration files
✔ Set file permissions
✔ Node: node1
✔ Set file permissions
✔ Node: node2
✔ Set file permissions
✔ Node: node1
✔ Set file permissions
✔ Node: node0
✔ Setup network nodes
✔ Finalize
Expand All @@ -318,19 +318,19 @@ Kubernetes Namespace : solo
**********************************************************************************
✔ Initialize
✔ Check network pod: node0
✔ Check network pod: node2
✔ Check network pod: node1
✔ Check network pod: node2
✔ Identify network pods
✔ Start node: node0
✔ Start node: node1
✔ Start node: node2
✔ Start node: node1
✔ Starting nodes
✔ Check node: node0
✔ Check node: node1
✔ Check node: node2
✔ Check nodes are ACTIVE
✔ Check proxy for node: node1
✔ Check proxy for node: node0
✔ Check proxy for node: node1
✔ Check proxy for node: node2
✔ Check node proxies are ACTIVE
```
Expand Down
Loading

0 comments on commit 586998f

Please sign in to comment.