kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor compute-vm for Terraform 1.3 (#860)

Browse Source 
* refactor compute-vm for Terraform 1.3

* bump Terraform version in CI tests config

* fix optional null handling (ht jccb)

* tfdoc

* update blueprints

* align fast

* align README examples
This commit is contained in:
Ludovico Magnocavallo
2022-10-07 10:53:53 +02:00
committed by GitHub
parent 8c88517199
commit e66340c4db
17 changed files with 104 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/compute-vm/main.tf
View File

@@ -29,12 +29,6 @@ locals {
for k, v in local.attached_disks :
k => v if try(v.options.replica_zone, null) == null
}
network_interface_options = {
for i, v in var.network_interfaces : i => lookup(var.network_interface_options, i, {
alias_ips = null,
nic_type = null
})
}
on_host_maintenance = (
var.options.spot || var.confidential_compute
? "TERMINATE"
@@ -169,7 +163,7 @@ resource "google_compute_instance" "default" {
}
boot_disk {
auto_delete = var.boot_disk_delete
auto_delete = var.boot_disk.auto_delete
initialize_params {
type = var.boot_disk.type
image = var.boot_disk.image
@@ -200,14 +194,14 @@ resource "google_compute_instance" "default" {
}
}
dynamic "alias_ip_range" {
for_each = local.network_interface_options[config.key].alias_ips != null ? local.network_interface_options[config.key].alias_ips : {}
for_each = config.value.alias_ips
iterator = config_alias
content {
subnetwork_range_name = config_alias.key
ip_cidr_range = config_alias.value
}
}
nic_type = local.network_interface_options[config.key].nic_type
nic_type = config.value.nic_type
}
}
@@ -272,7 +266,7 @@ resource "google_compute_instance_template" "default" {
labels = var.labels
disk {
auto_delete = var.boot_disk_delete
auto_delete = var.boot_disk.auto_delete
boot = true
disk_size_gb = var.boot_disk.size
disk_type = var.boot_disk.type
@@ -334,14 +328,14 @@ resource "google_compute_instance_template" "default" {
}
}
dynamic "alias_ip_range" {
for_each = local.network_interface_options[config.key].alias_ips != null ? local.network_interface_options[config.key].alias_ips : {}
for_each = config.value.alias_ips
iterator = config_alias
content {
subnetwork_range_name = config_alias.key
ip_cidr_range = config_alias.value
}
}
nic_type = local.network_interface_options[config.key].nic_type
nic_type = config.value.nic_type
}
}