diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 4a5bd7a11f..37507ddb56 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -72,7 +72,7 @@ jobs: export PATH="$HOME/bin:$PATH" cd deployments/ export PENUMBRA_VERSION='main' - export HELM_RELEASE='penumbra-testnet-preview' + export HELM_RELEASE='penumbra-preview' ./ci.sh - name: bounce grpcui diff --git a/deployments/README.md b/deployments/README.md index 962c927f07..e0bc43bdd9 100644 --- a/deployments/README.md +++ b/deployments/README.md @@ -5,7 +5,7 @@ Penumbra networks. As of 2023Q1, prior to mainnet, Penumbra Labs runs three (3) discrete networks: * "testnet", updated approximately weekly - * "testnet-preview", updated on every push to `main` in the repo + * "preview", updated on every push to `main` in the repo * "devnet", updated ad-hoc to serve as a sandbox debugging environment Those networks each have their own genesis and knowledge of peers. @@ -17,7 +17,7 @@ The networks are completely separate. . ├── ci.sh # runner script for executing a deploy against k8s ├── charts/ # helm charts used to configure genesis, nodes, and metrics -├── networks/ # logic specific to network, e.g. "testnet" or "testnet-preview" +├── networks/ # logic specific to network, e.g. "testnet" or "preview" │ └── testnet/ └── terraform/ # server and cluster provisioning logic └── modules/ diff --git a/deployments/charts/penumbra-metrics/values.yaml b/deployments/charts/penumbra-metrics/values.yaml index 3ef71fa079..93b638f8cd 100644 --- a/deployments/charts/penumbra-metrics/values.yaml +++ b/deployments/charts/penumbra-metrics/values.yaml @@ -24,8 +24,8 @@ scrape_configs: numFullNodes: 2 numValidators: 2 # printf formatting string, for generating scrape targets. - fmtFullNodeSvc: "penumbra-testnet-preview-fn-%d" - fmtValidatorSvc: "penumbra-testnet-preview-val-%d" + fmtFullNodeSvc: "penumbra-preview-fn-%d" + fmtValidatorSvc: "penumbra-preview-val-%d" # Configure PVCs for metrics data. If disabled, an emptydir will be used, # which means historical metrics will be wiped on every pod restart. diff --git a/deployments/helmfile.d/penumbra-testnet-preview.yaml b/deployments/helmfile.d/penumbra-preview.yaml similarity index 75% rename from deployments/helmfile.d/penumbra-testnet-preview.yaml rename to deployments/helmfile.d/penumbra-preview.yaml index 4a3683b752..68ac777dc1 100644 --- a/deployments/helmfile.d/penumbra-testnet-preview.yaml +++ b/deployments/helmfile.d/penumbra-preview.yaml @@ -1,6 +1,6 @@ --- releases: - - name: penumbra-testnet-preview + - name: penumbra-preview chart: ../charts/penumbra-network values: - persistence: @@ -12,29 +12,29 @@ releases: tag: main - network: external_addresses: "35.192.203.35:26656,34.28.180.178:26656" - - part_of: penumbra-testnet-preview + - part_of: penumbra-preview # Sidecar vars file for storing external ips. The "penumbra-network" chart # doesn't read these vars, but the "get-lb-ips" script writes them there, # and they've been manually duplicated above in the values.network.external_addresses field. - - vars/penumbra-testnet-preview-ips.yml + - vars/penumbra-preview-ips.yml - - name: penumbra-testnet-preview-nodes + - name: penumbra-preview-nodes chart: ../charts/penumbra-node needs: - - penumbra-testnet-preview + - penumbra-preview values: - ingressRoute: enabled: true hosts: pd: grpc.testnet-preview.penumbra.zone tm: rpc.testnet-preview.penumbra.zone - secretName: penumbra-testnet-preview-wildcard + secretName: penumbra-preview-wildcard - preserve_lb_svc: true - only_lb_svc: false - image: tag: main # Communicate intra-cluster to the private validator rpc address. - - penumbra_bootstrap_node_tendermint_rpc_url: "http://penumbra-testnet-preview-val-0:26657" + - penumbra_bootstrap_node_tendermint_rpc_url: "http://penumbra-preview-val-0:26657" - nodes: # We intentionally exclude external IPs in this declaration, but include them # in the external vars/ file, which is generated via `./scripts/get-lb-ips penumbra-devnet`. @@ -43,25 +43,25 @@ releases: - persistence: enabled: true size: 50G - - part_of: penumbra-testnet-preview + - part_of: penumbra-preview # empty vars file for storing external ips - - vars/penumbra-testnet-preview-nodes-ips.yml + - vars/penumbra-preview-nodes-ips.yml - - name: penumbra-testnet-preview-metrics + - name: penumbra-preview-metrics chart: ../charts/penumbra-metrics values: - ingressRoute: enabled: true hosts: grafana: grafana.testnet-preview.penumbra.zone - secretName: penumbra-testnet-preview-wildcard + secretName: penumbra-preview-wildcard - scrape_configs: # Must match settings from "penumbra-node" chart numFullNodes: 2 - fmtFullNodeSvc: "penumbra-testnet-preview-nodes-fn-%d" + fmtFullNodeSvc: "penumbra-preview-nodes-fn-%d" # Must match settings from "penumbra-network" chart numValidators: 2 - fmtValidatorSvc: "penumbra-testnet-preview-val-%d" + fmtValidatorSvc: "penumbra-preview-val-%d" - image: tag: main - persistence: diff --git a/deployments/helmfile.d/vars/penumbra-testnet-preview-nodes-ips.yml b/deployments/helmfile.d/vars/penumbra-preview-ips.yml similarity index 54% rename from deployments/helmfile.d/vars/penumbra-testnet-preview-nodes-ips.yml rename to deployments/helmfile.d/vars/penumbra-preview-ips.yml index 051d5c0886..7db5b7c648 100644 --- a/deployments/helmfile.d/vars/penumbra-testnet-preview-nodes-ips.yml +++ b/deployments/helmfile.d/vars/penumbra-preview-ips.yml @@ -1,3 +1,3 @@ nodes: + - external_address: 35.192.203.35:26656 - external_address: 34.133.250.112:26656 - - external_address: 34.136.197.29:26656 diff --git a/deployments/helmfile.d/vars/penumbra-testnet-preview-ips.yml b/deployments/helmfile.d/vars/penumbra-preview-nodes-ips.yml similarity index 53% rename from deployments/helmfile.d/vars/penumbra-testnet-preview-ips.yml rename to deployments/helmfile.d/vars/penumbra-preview-nodes-ips.yml index 5307c2d38c..7d517095b2 100644 --- a/deployments/helmfile.d/vars/penumbra-testnet-preview-ips.yml +++ b/deployments/helmfile.d/vars/penumbra-preview-nodes-ips.yml @@ -1,3 +1,3 @@ nodes: - - external_address: 35.192.203.35:26656 + - external_address: 34.135.6.235:26656 - external_address: 34.28.180.178:26656 diff --git a/deployments/networks/testnet-preview/README.md b/deployments/networks/preview/README.md similarity index 100% rename from deployments/networks/testnet-preview/README.md rename to deployments/networks/preview/README.md diff --git a/deployments/networks/testnet-preview/helm-values-for-penumbra-testnet-preview.yml b/deployments/networks/testnet-preview/helm-values-for-penumbra-testnet-preview.yml deleted file mode 100644 index 309f14bc99..0000000000 --- a/deployments/networks/testnet-preview/helm-values-for-penumbra-testnet-preview.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# Values file for "testnet-preview.penumbra.zone" CI deploys. -# Mostly sets the FQDNs on the ingress. -ingress: - enabled: true - hosts: - # The Tendermint RPC port. - rpc: rpc.testnet-preview.penumbra.zone - # The pd gRPC port. - grpc: grpc.testnet-preview.penumbra.zone - # The Grafana HTTP web interface, for viewing dashboards. - grafana: grafana.testnet-preview.penumbra.zone - -# Set lower SSD requests; default is 100Gi; we'll do half that -# for the short-lived preview deployment. -persistence: - size: 50Gi diff --git a/deployments/networks/testnet/cluster.tf b/deployments/networks/testnet/cluster.tf index 322167329d..1808a0660d 100644 --- a/deployments/networks/testnet/cluster.tf +++ b/deployments/networks/testnet/cluster.tf @@ -1,6 +1,6 @@ // Cluster configuration for testnet deployments. // As of 2022Q4, we're reusing a single cluster to host -// multiple environments, e.g. "testnet" and "testnet-preview". +// multiple environments, e.g. "testnet" and "preview". // We may migrate to multiple clusters in the future. module "gcp_terraform_state_testnet" { source = "../../terraform/modules/gcp/terraform_state/chain" diff --git a/deployments/relayer/README.md b/deployments/relayer/README.md index 2454905e42..e42bca4927 100644 --- a/deployments/relayer/README.md +++ b/deployments/relayer/README.md @@ -2,11 +2,11 @@ Stores config generation scripts for use with the [relayer](https://github.com/cosmos/relayer), for IBC functionality. Prior to mainnet, we plan to use `relayer` to synchronize actions -from testnet-preview to testnet. During 2023Q2, we're focusing on relaying between -testnet-preview and a local devnet on the same or similar commit. +from preview to testnet. During 2023Q2, we're focusing on relaying between +preview and a local devnet on the same or similar commit. ## Running a local devnet -To create a path between the public testnet-preview chain and a local devnet: +To create a path between the public preview chain and a local devnet: 0. Download the `rly` binary from [cosmos/relayer](https://github.com/cosmos/relayer/releases) and stick it in your `$PATH`. 1. Run `./deployments/scripts/relayer-local-devnet` to bootstrap the local chain.