Skip to content

Commit

Permalink
chore: rename hedera-network chart to fullstack-deployment (#437)
Browse files Browse the repository at this point in the history
Signed-off-by: Quan Nguyen <[email protected]>
  • Loading branch information
qnswirlds authored Oct 23, 2023
1 parent aaa9660 commit 08cea45
Show file tree
Hide file tree
Showing 68 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{
"assets": [
"gradle.properties",
"charts/hedera-network/Chart.yaml"
"charts/fullstack-deployment/Chart.yaml"
]
}
]
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: hedera-network
description: A Helm chart for the Hedera network
name: fullstack-deployment
description: A Helm chart for the fullstack deployment

# A chart can be either an 'application' or a 'library' chart.
#
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ you have the network deployed already.
- Use the `test_basic_deployment.bats` file as the template while creating new tests.
- In order to run and debug the tests inside the helm test container, do the following:

- Update `run` command section in `charts/hedera-network/template/tests/test-deployment.yaml` as below so that it keeps it running when we run `make helm-test`:
- Update `run` command section in `charts/fullstack-deployment/template/tests/test-deployment.yaml` as below so that it keeps it running when we run `make helm-test`:
```
- "/bin/bash"
- "-c"
Expand All @@ -24,7 +24,7 @@ you have the network deployed already.
cd /tests && ./run.sh
```
- Once debug is done, you can exit and use Ctrl+C to terminate the helm-test process (you will need to delete the `network-test` container using `kubectl delete network-test`).
- If it looks all good, revert changes in `charts/hedera-network/template/tests/test-deployment.yaml`
- If it looks all good, revert changes in `charts/fullstack-deployment/template/tests/test-deployment.yaml`

## Run
- Run `git submodule update --init` in order to install [bats](https://github.com/bats-core) for tests.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions dev/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SHELLOPTS:=$(if $(SHELLOPTS),$(SHELLOPTS):)pipefail:errexit

# Setup variables
SCRIPTS_DIR=$(PWD)/scripts
CHART_DIR=$(PWD)/../charts/hedera-network
CHART_DIR=$(PWD)/../charts/fullstack-deployment
SCRIPT_NAME=direct-install.sh
TMP_DIR=${SCRIPTS_DIR}/../temp

Expand Down Expand Up @@ -57,7 +57,7 @@ uninstall-chart:

.PHONY: update-helm-dependencies
update-helm-dependencies:
helm dependency update ../charts/hedera-network
helm dependency update ../charts/fullstack-deployment

.PHONY: deploy-shared
deploy-shared: update-helm-dependencies deploy-gateway-api deploy-prometheus-operator deploy-minio-operator-if-required
Expand Down
2 changes: 1 addition & 1 deletion dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Below are few helper commands to start the hedera network in the local kubernete

- `make setup`: sets up .env file with default settings. Edit this file with any desired settings.
- `make setup-cluster`: sets up a kind cluster. It assumes docker desktop is running with enough resources (6 core, 8Gb RAM, 100G disk)
- `make deploy-network`: deploys hedera-network helm chart and runs helm tests to ensure deployment was successful.
- `make deploy-network`: deploys fullstack-deployment helm chart and runs helm tests to ensure deployment was successful.
- `make start`: uses NMT to install platform in the network-node pods and starts the node.
- `make stop`: uses NMT to stop nodes.
- `make destroy-network`: uninstalls the helm chart
Expand Down
2 changes: 1 addition & 1 deletion dev/scripts/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ POD_MONITOR_ROLE="${POD_MONITOR_ROLE:-pod-monitor-role}"
GATEWAY_CLASS_NAME="${GATEWAY_CLASS_NAME:-fst-gateway-class}"

readonly SETUP_CHART_DIR="${SCRIPT_DIR}/../../charts/fullstack-cluster-setup"
readonly CHART_DIR="${SCRIPT_DIR}/../../charts/hedera-network"
readonly CHART_DIR="${SCRIPT_DIR}/../../charts/fullstack-deployment"

# telemetry related env variables
readonly COMMON_RESOURCES="${SCRIPT_DIR}/../common-resources"
Expand Down
4 changes: 2 additions & 2 deletions fullstack-examples/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ tasks.register<HelmInstallChartTask>("helmInstallFstChart") {
createNamespace.set(true)
namespace.set("fst-ns")
release.set("fst")
chart.set("../charts/hedera-network")
chart.set("../charts/fullstack-deployment")
}

tasks.register<HelmInstallChartTask>("helmInstallNginxChart") {
Expand All @@ -59,7 +59,7 @@ tasks.register<HelmReleaseExistsTask>("helmNginxExists") {
}

tasks.register<HelmDependencyUpdateTask>("helmDependencyUpdate") {
chartName.set("../charts/hedera-network")
chartName.set("../charts/fullstack-deployment")
}

tasks.register<HelmTestChartTask>("helmTestNginxChart") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.junit.jupiter.api.Test;

public class HelmDependencyUpdateTaskTest {
private static final String CHART = "../charts/hedera-network";
private static final String CHART = "../charts/fullstack-deployment";
private static Project project;

@BeforeAll
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ static void beforeAll() {
// 1. 'make deploy-chart'
// 2. run this test case, assuming it passes and installs fst
// 3. 'make destroy-chart'
@DisplayName("Helm Install Chart Task for Hedera Network Chart")
void testHelmInstallChartTaskForHederaNetworkChart() throws IOException {
HelmClient helmClient = HelmClient.defaultClient();
@DisplayName("Helm Install Chart Task for Fullstack Deployment Chart")
void testHelmInstallChartTaskForFullstackDeploymentChart() throws IOException {
final HelmClient helmClient = HelmClient.defaultClient();
suppressExceptions(() -> helmClient.uninstallChart("fst"));
try {
final File hederaNetworkChart = new File("../charts/hedera-network");
final String hederaNetworkChartPath = hederaNetworkChart.getCanonicalPath();
final File valuesFile = new File(hederaNetworkChartPath + File.separator + "values.yaml");
final File fullstackDeploymentChart = new File("../charts/fullstack-deployment");
final String fullstackDeploymentChartPath = fullstackDeploymentChart.getCanonicalPath();
final File valuesFile = new File(fullstackDeploymentChartPath + File.separator + "values.yaml");
final String valuesFilePath = valuesFile.getCanonicalPath();
HelmInstallChartTask helmInstallChartTask = project.getTasks()
.create("helmInstallFstChart", HelmInstallChartTask.class, task -> {
task.getChart().set(hederaNetworkChartPath);
task.getChart().set(fullstackDeploymentChartPath);
task.getRelease().set("fst");
// set image for nmt-install
task.getSet().add("defaults.root.image.repository=hashgraph/full-stack-testing/ubi8-init-dind");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ void testTestChartWithOptions() {
@Test
@DisplayName("Test Helm dependency update subcommand")
void testHelmDependencyUpdate() {
helmClient.dependencyUpdate("../charts/hedera-network");
helmClient.dependencyUpdate("../charts/fullstack-deployment");
}

@Test
Expand Down

0 comments on commit 08cea45

Please sign in to comment.