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

FIX: allowed boot disk to be reused when VM is rebuilt #933

Merged
merged 2 commits into from
Nov 21, 2024
Merged

FIX: allowed boot disk to be reused when VM is rebuilt #933

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0872644
allowed boot disk to be reused when VM is rebuilt
auto-mausx Nov 21, 2024
f3af774
added TF code changes for RPC endpoint and Redis integration
auto-mausx Nov 21, 2024
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
10 changes: 5 additions & 5 deletions infra/modules/mig_template/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
#########

locals {
source_image = var.source_image != "" ? var.source_image : "centos-7-v20201112"
source_image_family = var.source_image_family != "" ? var.source_image_family : "centos-7"
source_image_project = var.source_image_project != "" ? var.source_image_project : "centos-cloud"

boot_disk = [
{
source_image = var.source_image != "" ? format("${local.source_image_project}/${local.source_image}") : format("${local.source_image_project}/${local.source_image_family}")
source_image = var.source_image
disk_size_gb = var.disk_size_gb
disk_type = var.disk_type
disk_labels = var.disk_labels
auto_delete = var.auto_delete
device_name = var.device_name
interface = var.interface
mode = var.mode
boot = "true"
},
]
Expand Down Expand Up @@ -156,7 +156,7 @@ resource "google_compute_instance_template" "tpl" {

lifecycle {
create_before_destroy = "true"
ignore_changes = [ disk[0].source_image, labels ]
ignore_changes = [disk[0].source_image, labels]
}

scheduling {
Expand Down
22 changes: 12 additions & 10 deletions infra/modules/mig_template/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,21 @@ variable "resource_policies" {
variable "source_image" {
description = "Source disk image. If neither source_image nor source_image_family is specified, defaults to the latest public CentOS image."
type = string
default = ""
}

variable "source_image_family" {
description = "Source image family. If neither source_image nor source_image_family is specified, defaults to the latest public CentOS image."
type = string
default = "centos-7"
variable "device_name" {
description = "Disk device name"
default = "persistent-disk-0"
}

variable "source_image_project" {
description = "Project where the source image comes from. The default project contains CentOS images."
type = string
default = "centos-cloud"
variable "interface" {
default = "SCSI"
description = "Interface type of the boot disk"
}

variable "mode" {
default = "READ_WRITE"
description = "Boot disk mode"
}

variable "disk_size_gb" {
Expand Down Expand Up @@ -146,7 +148,7 @@ variable "disk_encryption_key" {
variable "auto_delete" {
description = "Whether or not the boot disk should be auto-deleted"
type = string
default = "true"
default = "false"
}

variable "additional_disks" {
Expand Down
28 changes: 13 additions & 15 deletions infra/multichain-dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ module "gce-container" {
container = {
image = "europe-west1-docker.pkg.dev/near-cs-dev/multichain-public/multichain-dev:latest"

port = "3000"
port = "3000"

volumeMounts = [
{
mountPath = "/data"
name = "host-path"
readOnly = false
name = "host-path"
readOnly = false
}
]

Expand Down Expand Up @@ -75,20 +75,20 @@ module "gce-container" {
value = var.env
},
{
name = "MPC_REDIS_URL",
name = "MPC_REDIS_URL",
value = var.redis_url
}
])
}

volumes = [
{
name = "host-path"
hostPath = {
path = "/var/redis"
}
{
name = "host-path"
hostPath = {
path = "/var/redis"
}
]
}
]
}

resource "google_service_account" "service_account" {
Expand Down Expand Up @@ -131,14 +131,12 @@ module "mig_template" {
email = google_service_account.service_account.email,
scopes = ["cloud-platform"]
}
name_prefix = "multichain-${count.index}"
source_image_family = "cos-113-lts"
source_image_project = "cos-cloud"
machine_type = "e2-medium"
name_prefix = "multichain-${count.index}"
machine_type = "e2-medium"

startup_script = "docker rm watchtower ; docker run -d --name watchtower -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --debug --interval 30"

source_image = reverse(split("/", module.gce-container[count.index].source_image))[0]
source_image = var.source_image
metadata = merge(var.additional_metadata, { "gce-container-declaration" = module.gce-container["${count.index}"].metadata_value })
tags = [
"multichain"
Expand Down
15 changes: 8 additions & 7 deletions infra/multichain-dev/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ variable "mig_name" {
default = "mpc-mig"
}

variable "source_image" {
type = string
default = "projects/cos-cloud/global/images/cos-stable-117-18613-75-37"
}

variable "image" {
description = "The Docker image to deploy to GCE instances"
type = string
Expand Down Expand Up @@ -79,10 +84,6 @@ variable "env" {
default = "dev"
}

variable "redis_url" {
type = string
default = "redis://127.0.0.1:6379"
}

variable "static_env" {
type = list(object({
Expand All @@ -92,7 +93,7 @@ variable "static_env" {
default = [
{
name = "MPC_NEAR_RPC"
value = "https://rpc.testnet.near.org"
value = "https://rpc.testnet.fastnear.com"
},
{
name = "MPC_CONTRACT_ID"
Expand All @@ -104,7 +105,7 @@ variable "static_env" {
},
{
name = "MPC_INDEXER_START_BLOCK_HEIGHT"
value = 178736306
value = 180133172
},
{
name = "AWS_DEFAULT_REGION"
Expand All @@ -130,6 +131,6 @@ variable "static_env" {
}

variable "redis_url" {
type = string
type = string
default = "redis://127.0.0.1:6379"
}
66 changes: 32 additions & 34 deletions infra/multichain-mainnet/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ module "gce-container" {
value = "https://${var.node_configs[count.index].domain}"
},
{
name = "MPC_SK_SHARE_SECRET_ID"
name = "MPC_SK_SHARE_SECRET_ID"
value = var.node_configs["${count.index}"].sk_share_secret_id
},
{
name = "MPC_ENV",
name = "MPC_ENV",
value = var.env
}
])
Expand All @@ -74,11 +74,11 @@ resource "google_service_account" "service_account" {

resource "google_project_iam_member" "sa-roles" {
for_each = toset([
"roles/datastore.user",
"roles/secretmanager.admin",
"roles/storage.objectAdmin",
"roles/iam.serviceAccountAdmin",
"roles/logging.logWriter"
"roles/datastore.user",
"roles/secretmanager.admin",
"roles/storage.objectAdmin",
"roles/iam.serviceAccountAdmin",
"roles/logging.logWriter"
])

role = each.key
Expand All @@ -98,7 +98,7 @@ resource "google_compute_global_address" "external_ips" {

resource "google_compute_managed_ssl_certificate" "mainnet_ssl" {
count = length(var.node_configs)
name = "multichain-mainnet-ssl-${count.index}"
name = "multichain-mainnet-ssl-${count.index}"

managed {
domains = [var.node_configs[count.index].domain]
Expand All @@ -115,14 +115,12 @@ module "ig_template" {
email = google_service_account.service_account.email,
scopes = ["cloud-platform"]
}
name_prefix = "multichain-mainnet-${count.index}"
source_image_family = "cos-113-lts"
source_image_project = "cos-cloud"
machine_type = "n2d-standard-2"
name_prefix = "multichain-mainnet-${count.index}"
machine_type = "n2d-standard-2"

startup_script = "docker rm watchtower ; docker run -d --name watchtower -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --debug --interval 30"

source_image = reverse(split("/", module.gce-container[count.index].source_image))[0]
source_image = var.source_image
metadata = merge(var.additional_metadata, { "gce-container-declaration" = module.gce-container["${count.index}"].metadata_value })
tags = [
"multichain"
Expand Down Expand Up @@ -163,38 +161,38 @@ resource "google_compute_health_check" "multichain_healthcheck" {
}

resource "google_compute_global_forwarding_rule" "http_fw" {
count = length(var.node_configs)
name = "multichain-mainnet-http-rule-${count.index}"
target = google_compute_target_http_proxy.default[count.index].id
port_range = "80"
ip_protocol = "TCP"
count = length(var.node_configs)
name = "multichain-mainnet-http-rule-${count.index}"
target = google_compute_target_http_proxy.default[count.index].id
port_range = "80"
ip_protocol = "TCP"
load_balancing_scheme = "EXTERNAL"
ip_address = google_compute_global_address.external_ips[count.index].address
ip_address = google_compute_global_address.external_ips[count.index].address
}

resource "google_compute_global_forwarding_rule" "https_fw" {
count = length(var.node_configs)
name = "multichain-mainnet-https-rule-${count.index}"
target = google_compute_target_https_proxy.default_https[count.index].id
port_range = "443"
ip_protocol = "TCP"
count = length(var.node_configs)
name = "multichain-mainnet-https-rule-${count.index}"
target = google_compute_target_https_proxy.default_https[count.index].id
port_range = "443"
ip_protocol = "TCP"
load_balancing_scheme = "EXTERNAL"
ip_address = google_compute_global_address.external_ips[count.index].address
ip_address = google_compute_global_address.external_ips[count.index].address
}

resource "google_compute_target_http_proxy" "default" {
count = length(var.node_configs)
count = length(var.node_configs)
name = "multichain-mainnet-http-target-proxy-${count.index}"
description = "a description"
url_map = google_compute_url_map.redirect_default[count.index].id
}

resource "google_compute_target_https_proxy" "default_https" {
count = length(var.node_configs)
name = "multichain-mainnet-https-target-proxy-${count.index}"
description = "a description"
ssl_certificates = [ google_compute_managed_ssl_certificate.mainnet_ssl[count.index].self_link ]
url_map = google_compute_url_map.default[count.index].id
count = length(var.node_configs)
name = "multichain-mainnet-https-target-proxy-${count.index}"
description = "a description"
ssl_certificates = [google_compute_managed_ssl_certificate.mainnet_ssl[count.index].self_link]
url_map = google_compute_url_map.default[count.index].id
}

resource "google_compute_url_map" "default" {
Expand All @@ -204,8 +202,8 @@ resource "google_compute_url_map" "default" {
}

resource "google_compute_url_map" "redirect_default" {
count = length(var.node_configs)
name = "multichain-mainnet-redirect-url-map-${count.index}"
count = length(var.node_configs)
name = "multichain-mainnet-redirect-url-map-${count.index}"
default_url_redirect {
strip_query = false
https_redirect = true
Expand All @@ -218,7 +216,7 @@ resource "google_compute_backend_service" "multichain_backend" {
load_balancing_scheme = "EXTERNAL"

log_config {
enable = true
enable = true
sample_rate = 0.5
}
backend {
Expand Down
13 changes: 9 additions & 4 deletions infra/multichain-mainnet/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ variable "image" {
default = "us-east1-docker.pkg.dev/near-cs-mainnet/multichain-public/multichain-mainnet:latest"
}

variable "source_image" {
type = string
default = "projects/cos-cloud/global/images/cos-stable-117-18613-75-37"
}

variable "image_port" {
description = "The port the image exposes for HTTP requests"
type = number
Expand All @@ -43,8 +48,8 @@ variable "network" {
variable "additional_metadata" {
type = map(any)
description = "Additional metadata to attach to the instance"
default = {
cos-update-strategy: "update_enabled"
default = {
cos-update-strategy : "update_enabled"
}
}

Expand Down Expand Up @@ -77,7 +82,7 @@ variable "node_configs" {
}

variable "env" {
type = string
type = string
default = "mainnet"
}

Expand Down Expand Up @@ -132,5 +137,5 @@ variable "static_env" {

variable "domain" {
description = "DNS name for your node"
default = null
default = null
}
18 changes: 8 additions & 10 deletions infra/multichain-testnet/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ resource "google_service_account" "service_account" {

resource "google_project_iam_member" "sa-roles" {
for_each = toset([
"roles/datastore.user",
"roles/secretmanager.admin",
"roles/storage.objectAdmin",
"roles/iam.serviceAccountAdmin",
"roles/logging.logWriter"
"roles/datastore.user",
"roles/secretmanager.admin",
"roles/storage.objectAdmin",
"roles/iam.serviceAccountAdmin",
"roles/logging.logWriter"
])

role = each.key
Expand All @@ -106,14 +106,12 @@ module "ig_template" {
email = google_service_account.service_account.email,
scopes = ["cloud-platform"]
}
name_prefix = "multichain-testnet-${count.index}"
source_image_family = "cos-113-lts"
source_image_project = "cos-cloud"
machine_type = "n2d-standard-2"
name_prefix = "multichain-testnet-${count.index}"
machine_type = "n2d-standard-2"

startup_script = "docker rm watchtower ; docker run -d --name watchtower -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --debug --interval 30"

source_image = reverse(split("/", module.gce-container[count.index].source_image))[0]
source_image = var.source_image
metadata = merge(var.additional_metadata, { "gce-container-declaration" = module.gce-container["${count.index}"].metadata_value })
tags = [
"multichain"
Expand Down
Loading