Skip to content

Commit 9aaa001

Browse files
authored
chore: cleanup RPC ingresses (#19815)
Adds a nextnet ingress and removes unused ones.
2 parents 60b84cc + d9c5ed9 commit 9aaa001

File tree

5 files changed

+20
-40
lines changed

5 files changed

+20
-40
lines changed

spartan/environments/next-net.env

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,10 @@ REDEPLOY_ROLLUP_CONTRACTS=true
5050

5151
DEBUG_P2P_INSTRUMENT_MESSAGES=true
5252

53+
RPC_INGRESS_ENABLED=true
54+
RPC_INGRESS_HOSTS='["nextnet.aztec-labs.com"]'
55+
RPC_INGRESS_STATIC_IP_NAME=nextnet-rpc-ip
56+
RPC_INGRESS_SSL_CERT_NAMES='["nextnet-rpc-cert"]'
57+
5358
VALIDATOR_HA_REPLICAS=1
54-
VALIDATOR_RESOURCE_PROFILE="prod-spot"
59+
VALIDATOR_RESOURCE_PROFILE="prod-spot"

spartan/environments/staging-public.env

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,3 @@ BOT_TRANSFERS_FOLLOW_CHAIN=PENDING
4444
BOT_SWAPS_REPLICAS=1
4545
BOT_SWAPS_FOLLOW_CHAIN=PENDING
4646
BOT_SWAPS_TX_INTERVAL_SECONDS=350
47-
48-
RPC_INGRESS_ENABLED=true
49-
RPC_INGRESS_HOSTS='["staging.alpha-testnet.aztec-labs.com"]'
50-
RPC_INGRESS_STATIC_IP_NAME=staging-public-rpc-ip
51-
RPC_INGRESS_SSL_CERT_NAMES='["staging-public-rpc-cert"]'

spartan/terraform/gke-cluster/alpha-testnet-static-ip.tf

Lines changed: 0 additions & 11 deletions
This file was deleted.

spartan/terraform/gke-cluster/network-ingress.tf

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
resource "google_compute_global_address" "staging_public_rpc_ip" {
2-
name = "staging-public-rpc-ip"
3-
description = "Static IP for staging-public network RPC ingress"
1+
resource "google_compute_global_address" "testnet_rpc_ip" {
2+
name = "testnet-rpc-ip"
3+
description = "Static IP for testnet RPC ingress"
44

55
lifecycle {
66
prevent_destroy = true
77
}
88
}
99

10-
resource "google_compute_managed_ssl_certificate" "staging_public_rpc_cert" {
11-
name = "staging-public-rpc-cert"
12-
description = "Managed SSL certificate for staging-public RPC ingress"
10+
resource "google_compute_managed_ssl_certificate" "testnet_rpc_cert" {
11+
name = "testnet-rpc-cert"
12+
description = "Managed SSL certificate for testnet RPC ingress"
1313

1414
managed {
15-
domains = ["staging.alpha-testnet.aztec-labs.com"]
15+
domains = ["rpc.testnet.aztec-labs.com"]
1616
}
1717

1818
lifecycle {
1919
prevent_destroy = true
2020
}
2121
}
2222

23-
resource "google_compute_global_address" "testnet_rpc_ip" {
24-
name = "testnet-rpc-ip"
25-
description = "Static IP for testnet RPC ingress"
23+
resource "google_compute_global_address" "nextnet_rpc_ip" {
24+
name = "nextnet-rpc-ip"
25+
description = "Static IP for nextnet RPC ingress"
2626

2727
lifecycle {
2828
prevent_destroy = true
2929
}
3030
}
3131

32-
resource "google_compute_managed_ssl_certificate" "testnet_rpc_cert" {
33-
name = "testnet-rpc-cert"
34-
description = "Managed SSL certificate for testnet RPC ingress"
32+
resource "google_compute_managed_ssl_certificate" "nextnet_rpc_cert" {
33+
name = "nextnet-rpc-cert"
34+
description = "Managed SSL certificate for nextnet RPC ingress"
3535

3636
managed {
37-
domains = ["rpc.testnet.aztec-labs.com"]
37+
domains = ["nextnet.aztec-labs.com"]
3838
}
3939

4040
lifecycle {

spartan/terraform/gke-cluster/outputs.tf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,3 @@ output "region" {
77
value = var.region
88
}
99

10-
output "staging_public_rpc_ip" {
11-
value = google_compute_global_address.staging_public_rpc_ip.address
12-
description = "The static IP address for staging-public RPC ingress"
13-
}
14-
15-
output "staging_public_rpc_cert_name" {
16-
value = google_compute_managed_ssl_certificate.staging_public_rpc_cert.name
17-
description = "The name of the managed SSL certificate for staging-public RPC"
18-
}

0 commit comments

Comments
 (0)