Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kmaus near/change vpc connector #367

Merged
merged 4 commits into from
Nov 16, 2023
Merged

Kmaus near/change vpc connector #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6747628
setting leader node to be accessable to internal traffic only
kmaus-near Nov 16, 2023
d28c1a1
added dev VPC connector and set leader node for internal and LB traffic
kmaus-near Nov 16, 2023
0bb837e
changed credential configs
kmaus-near Nov 16, 2023
4a0ec97
Merge branch 'develop' into kmaus-near/change-vpc-connector
kmaus-near Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion infra/modules/leader/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
resource "google_cloud_run_v2_service" "leader" {
name = var.service_name
location = var.region
ingress = "INGRESS_TRAFFIC_INTERNAL_ONLY"
ingress = "INGRESS_TRAFFIC_INTERNAL_LOAD_BALANCER"


template {
service_account = var.service_account_email
Expand Down
14 changes: 7 additions & 7 deletions infra/mpc-recovery-dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,20 @@ module "mpc-signer-lb" {
count = length(var.signer_configs)
source = "../modules/internal_cloudrun_lb"
name = "mpc-${var.env}-signer-${count.index}"
network_id = data.google_compute_network.prod_network.id
subnetwork_id = data.google_compute_subnetwork.prod_subnetwork.id
network_id = data.google_compute_network.dev_network.id
subnetwork_id = data.google_compute_subnetwork.dev_subnetwork.id
project_id = var.project
region = "us-central1"
region = "us-east1"
service_name = "mpc-recovery-signer-${count.index}-${var.env}"
}

module "mpc-leader-lb" {
source = "../modules/internal_cloudrun_lb"
name = "mpc-${var.env}-leader"
network_id = data.google_compute_network.prod_network.id
subnetwork_id = data.google_compute_subnetwork.prod_subnetwork.id
network_id = data.google_compute_network.dev_network.id
subnetwork_id = data.google_compute_subnetwork.dev_subnetwork.id
project_id = var.project
region = "us-central1"
region = "us-east1"
service_name = "mpc-recovery-leader-${var.env}"
}
/*
Expand Down Expand Up @@ -164,7 +164,7 @@ module "leader" {
zone = var.zone
service_account_email = google_service_account.service_account.email
docker_image = var.docker_image
connector_id = var.prod-connector
connector_id = var.dev-connector

signer_node_urls = concat(module.signer.*.node.uri, var.external_signer_node_urls)
near_rpc = local.workspace.near_rpc
Expand Down
2 changes: 1 addition & 1 deletion infra/mpc-recovery-dev/terraform-dev.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
env = "dev"
project = "pagoda-discovery-platform-dev"
docker_image = "us-east1-docker.pkg.dev/pagoda-discovery-platform-dev/mpc-recovery/mpc-recovery-dev:f405e5594e666ef6a6e5ccf701c0d70c9673d4fe"
docker_image = "us-east1-docker.pkg.dev/pagoda-discovery-platform-dev/mpc-recovery/mpc-recovery-dev:3b95ef518e320cf35438bbc2e39be71040769d99"

account_creator_id = "mpc-recovery-dev-creator.testnet"
account_creator_sk_secret_id = "mpc-recovery-account-creator-sk-dev"
Expand Down
8 changes: 4 additions & 4 deletions infra/mpc-recovery-dev/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ variable "prod-connector" {
}

data "google_compute_subnetwork" "dev_subnetwork" {
name = "dev-us-central1"
name = "cloudrun-main-dev-us-east1"
project = "pagoda-shared-infrastructure"
region = "us-central1"
region = "us-east1"
}

data "google_compute_subnetwork" "prod_subnetwork" {
name = "prod-us-central1"
name = "cloudrun-main-prod-us-east1"
project = "pagoda-shared-infrastructure"
region = "us-central1"
region = "us-east1"
}

data "google_compute_network" "dev_network" {
Expand Down
Loading