From 3ec7dc8c3a7f86c3fe4835998b8c3523d0ff1fa7 Mon Sep 17 00:00:00 2001 From: Conor Schaefer Date: Mon, 25 Sep 2023 12:06:23 -0700 Subject: [PATCH] ci: update testnet public ips Removes reserved IPv4 addresses that are no longer used. For HTTPS services, we now use a single entry IP to a Traefik daemonset to handle traffic for all the various endpoints [0]. Regenerates the public IPs for the P2P services and commits them to version control. We do this as part of release prep for Testnet 61 [1], building on the deploy overhaul described in [2]. [0] https://github.com/penumbra-zone/penumbra/issues/2341 [1] https://github.com/penumbra-zone/penumbra/issues/3046 [2] https://github.com/penumbra-zone/penumbra/issues/2983 --- deployments/helmfile.d/penumbra-testnet.yaml | 3 +- .../helmfile.d/vars/penumbra-testnet-ips.yml | 3 ++ .../vars/penumbra-testnet-nodes-ips.yml | 3 ++ deployments/networks/testnet/main.tf | 46 ------------------- 4 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 deployments/networks/testnet/main.tf diff --git a/deployments/helmfile.d/penumbra-testnet.yaml b/deployments/helmfile.d/penumbra-testnet.yaml index afda8719cf..8e9dd4f880 100644 --- a/deployments/helmfile.d/penumbra-testnet.yaml +++ b/deployments/helmfile.d/penumbra-testnet.yaml @@ -12,8 +12,7 @@ releases: tag: latest - network: preserve_chain_id: true - # TODO: provision real ips for testnet env - # external_addresses: "104.198.226.117:26656,34.134.110.25:26656" + external_addresses: "34.68.222.252:26656,35.226.255.25:26656" - part_of: penumbra-testnet # 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, diff --git a/deployments/helmfile.d/vars/penumbra-testnet-ips.yml b/deployments/helmfile.d/vars/penumbra-testnet-ips.yml index e69de29bb2..a69b6e9274 100644 --- a/deployments/helmfile.d/vars/penumbra-testnet-ips.yml +++ b/deployments/helmfile.d/vars/penumbra-testnet-ips.yml @@ -0,0 +1,3 @@ +nodes: + - external_address: 34.68.222.252:26656 + - external_address: 35.226.255.25:26656 diff --git a/deployments/helmfile.d/vars/penumbra-testnet-nodes-ips.yml b/deployments/helmfile.d/vars/penumbra-testnet-nodes-ips.yml index e69de29bb2..e92b9791d9 100644 --- a/deployments/helmfile.d/vars/penumbra-testnet-nodes-ips.yml +++ b/deployments/helmfile.d/vars/penumbra-testnet-nodes-ips.yml @@ -0,0 +1,3 @@ +nodes: + - external_address: 35.225.116.144:26656 + - external_address: 35.224.80.161:26656 diff --git a/deployments/networks/testnet/main.tf b/deployments/networks/testnet/main.tf deleted file mode 100644 index bf098610f7..0000000000 --- a/deployments/networks/testnet/main.tf +++ /dev/null @@ -1,46 +0,0 @@ -// The IPv4 address used for URLs like `rpc.testnet.penumbra.zone`. -// We reserve this ahead of time, so that the DNS records can be static, -// and point to the currently running deployment. -resource "google_compute_global_address" "testnet-ingress" { - // The 'name' field must match the name referred to in helm chart. - // By default it's "penumbra.name" which is either "penumbra-testnet" - // or "penumbra-testnet-preview". - name = "penumbra-testnet-ingress-ip" - project = "penumbra-sl-testnet" -} - -// Declare 'output' so the reserved IP is easily viewable. -output "testnet_reserved_ip" { - value = google_compute_global_address.testnet-ingress.address -} - -// There's another DNS record required, that doesn't map to the static IP. -// It's a NodePort service, so it must match the ExternalIP of a given node. -// For reference: -// -// kubectl get svc penumbra-testnet-p2p-fn-0 \ -// --output jsonpath='{.status.loadBalancer.ingress[0].ip}' -// -// The resulting IP should have an A record for "fullnode..penumbra.zone". - -// BEGIN values for testnet-preview.penumbra.zone // -resource "google_compute_global_address" "testnet-preview-ingress" { - name = "penumbra-testnet-preview-ingress-ip" - project = "penumbra-sl-testnet" -} - -output "testnet_preview_reserved_ip" { - value = google_compute_global_address.testnet-preview-ingress.address -} -// END values for testnet-preview.penumbra.zone // - -// BEGIN values for devnet.penumbra.zone // -resource "google_compute_global_address" "devnet-ingress" { - name = "penumbra-devnet-ingress-ip" - project = "penumbra-sl-testnet" -} - -output "devnet_reserved_ip" { - value = google_compute_global_address.devnet-ingress.address -} -// END values for devnet.penumbra.zone //