Merge branch 'master' into cloud-functions-cpu
This commit is contained in:
Julio Castillo
GitHub
commit
8e1e761577
|
|
@ -79,8 +79,12 @@ module "nat" {
|
|||
name = "default"
|
||||
router_network = module.vpc.name
|
||||
config_source_subnets = "LIST_OF_SUBNETWORKS"
|
||||
# 64512/11 = 5864 . 11 is the number of usable IPs in the proxy subnet
|
||||
config_min_ports_per_vm = 5864
|
||||
config_port_allocation = {
|
||||
enable_endpoint_independent_mapping = false
|
||||
enable_dynamic_port_allocation = true
|
||||
# 64512/11 = 5864 . 11 is the number of usable IPs in the proxy subnet
|
||||
min_ports_per_vm = 5864
|
||||
}
|
||||
subnetworks = [
|
||||
{
|
||||
self_link = module.vpc.subnet_self_links["${var.region}/proxy"]
|
||||
|
|
|
|||
|
|
@ -98,7 +98,11 @@ module "nat" {
|
|||
router_network = module.vpc.name
|
||||
config_source_subnets = "LIST_OF_SUBNETWORKS"
|
||||
# 64512/11 = 5864 . 11 is the number of usable IPs in the proxy subnet
|
||||
config_min_ports_per_vm = 5864
|
||||
config_port_allocation = {
|
||||
enable_dynamic_port_allocation = true
|
||||
enable_endpoint_independent_mapping = false
|
||||
min_ports_per_vm = 5864
|
||||
}
|
||||
subnetworks = [
|
||||
{
|
||||
self_link = module.vpc.subnet_self_links["${var.region}/proxy"]
|
||||
|
|
|
|||
|
|
@ -20,19 +20,19 @@ module "nat" {
|
|||
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [name](variables.tf#L57) | Name of the Cloud NAT resource. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L62) | Project where resources will be created. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L67) | Region where resources will be created. | <code>string</code> | ✓ | |
|
||||
| [config_port_allocation](variables.tf#L23) | Configuration for how to assign ports to virtual machines. min_ports_per_vm and max_ports_per_vm have no effect unless enable_dynamic_port_allocation is set to 'true'. | <code title="object({ enable_endpoint_independent_mapping = optional(bool, true) enable_dynamic_port_allocation = optional(bool, false) min_ports_per_vm = optional(number, 64) max_ports_per_vm = optional(number, 65536) }) default = { enable_endpoint_independent_mapping = true enable_dynamic_port_allocation = false min_ports_per_vm = 64 max_ports_per_vm = 65536 }">object({…}</code> | ✓ | |
|
||||
| [name](variables.tf#L73) | Name of the Cloud NAT resource. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L78) | Project where resources will be created. | <code>string</code> | ✓ | |
|
||||
| [region](variables.tf#L83) | Region where resources will be created. | <code>string</code> | ✓ | |
|
||||
| [addresses](variables.tf#L17) | Optional list of external address self links. | <code>list(string)</code> | | <code>[]</code> |
|
||||
| [config_min_ports_per_vm](variables.tf#L23) | Minimum number of ports allocated to a VM from this NAT config. | <code>number</code> | | <code>64</code> |
|
||||
| [config_source_subnets](variables.tf#L29) | Subnetwork configuration (ALL_SUBNETWORKS_ALL_IP_RANGES, ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES, LIST_OF_SUBNETWORKS). | <code>string</code> | | <code>"ALL_SUBNETWORKS_ALL_IP_RANGES"</code> |
|
||||
| [config_timeouts](variables.tf#L35) | Timeout configurations. | <code title="object({ icmp = number tcp_established = number tcp_transitory = number udp = number })">object({…})</code> | | <code title="{ icmp = 30 tcp_established = 1200 tcp_transitory = 30 udp = 30 }">{…}</code> |
|
||||
| [logging_filter](variables.tf#L51) | Enables logging if not null, value is one of 'ERRORS_ONLY', 'TRANSLATIONS_ONLY', 'ALL'. | <code>string</code> | | <code>null</code> |
|
||||
| [router_asn](variables.tf#L72) | Router ASN used for auto-created router. | <code>number</code> | | <code>64514</code> |
|
||||
| [router_create](variables.tf#L78) | Create router. | <code>bool</code> | | <code>true</code> |
|
||||
| [router_name](variables.tf#L84) | Router name, leave blank if router will be created to use auto generated name. | <code>string</code> | | <code>null</code> |
|
||||
| [router_network](variables.tf#L90) | Name of the VPC used for auto-created router. | <code>string</code> | | <code>null</code> |
|
||||
| [subnetworks](variables.tf#L96) | Subnetworks to NAT, only used when config_source_subnets equals LIST_OF_SUBNETWORKS. | <code title="list(object({ self_link = string, config_source_ranges = list(string) secondary_ranges = list(string) }))">list(object({…}))</code> | | <code>[]</code> |
|
||||
| [config_source_subnets](variables.tf#L45) | Subnetwork configuration (ALL_SUBNETWORKS_ALL_IP_RANGES, ALL_SUBNETWORKS_ALL_PRIMARY_IP_RANGES, LIST_OF_SUBNETWORKS). | <code>string</code> | | <code>"ALL_SUBNETWORKS_ALL_IP_RANGES"</code> |
|
||||
| [config_timeouts](variables.tf#L51) | Timeout configurations. | <code title="object({ icmp = number tcp_established = number tcp_transitory = number udp = number })">object({…})</code> | | <code title="{ icmp = 30 tcp_established = 1200 tcp_transitory = 30 udp = 30 }">{…}</code> |
|
||||
| [logging_filter](variables.tf#L67) | Enables logging if not null, value is one of 'ERRORS_ONLY', 'TRANSLATIONS_ONLY', 'ALL'. | <code>string</code> | | <code>null</code> |
|
||||
| [router_asn](variables.tf#L88) | Router ASN used for auto-created router. | <code>number</code> | | <code>64514</code> |
|
||||
| [router_create](variables.tf#L94) | Create router. | <code>bool</code> | | <code>true</code> |
|
||||
| [router_name](variables.tf#L100) | Router name, leave blank if router will be created to use auto generated name. | <code>string</code> | | <code>null</code> |
|
||||
| [router_network](variables.tf#L106) | Name of the VPC used for auto-created router. | <code>string</code> | | <code>null</code> |
|
||||
| [subnetworks](variables.tf#L112) | Subnetworks to NAT, only used when config_source_subnets equals LIST_OF_SUBNETWORKS. | <code title="list(object({ self_link = string, config_source_ranges = list(string) secondary_ranges = list(string) }))">list(object({…}))</code> | | <code>[]</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
|
|
|||
|
|
@ -34,18 +34,21 @@ resource "google_compute_router" "router" {
|
|||
}
|
||||
|
||||
resource "google_compute_router_nat" "nat" {
|
||||
project = var.project_id
|
||||
region = var.region
|
||||
name = var.name
|
||||
router = local.router_name
|
||||
nat_ips = var.addresses
|
||||
nat_ip_allocate_option = length(var.addresses) > 0 ? "MANUAL_ONLY" : "AUTO_ONLY"
|
||||
source_subnetwork_ip_ranges_to_nat = var.config_source_subnets
|
||||
min_ports_per_vm = var.config_min_ports_per_vm
|
||||
icmp_idle_timeout_sec = var.config_timeouts.icmp
|
||||
udp_idle_timeout_sec = var.config_timeouts.udp
|
||||
tcp_established_idle_timeout_sec = var.config_timeouts.tcp_established
|
||||
tcp_transitory_idle_timeout_sec = var.config_timeouts.tcp_transitory
|
||||
project = var.project_id
|
||||
region = var.region
|
||||
name = var.name
|
||||
router = local.router_name
|
||||
nat_ips = var.addresses
|
||||
nat_ip_allocate_option = length(var.addresses) > 0 ? "MANUAL_ONLY" : "AUTO_ONLY"
|
||||
source_subnetwork_ip_ranges_to_nat = var.config_source_subnets
|
||||
icmp_idle_timeout_sec = var.config_timeouts.icmp
|
||||
udp_idle_timeout_sec = var.config_timeouts.udp
|
||||
tcp_established_idle_timeout_sec = var.config_timeouts.tcp_established
|
||||
tcp_transitory_idle_timeout_sec = var.config_timeouts.tcp_transitory
|
||||
enable_endpoint_independent_mapping = var.config_port_allocation.enable_endpoint_independent_mapping
|
||||
enable_dynamic_port_allocation = var.config_port_allocation.enable_dynamic_port_allocation
|
||||
min_ports_per_vm = var.config_port_allocation.min_ports_per_vm
|
||||
max_ports_per_vm = var.config_port_allocation.max_ports_per_vm
|
||||
|
||||
log_config {
|
||||
enable = var.logging_filter == null ? false : true
|
||||
|
|
|
|||
|
|
@ -20,10 +20,26 @@ variable "addresses" {
|
|||
default = []
|
||||
}
|
||||
|
||||
variable "config_min_ports_per_vm" {
|
||||
description = "Minimum number of ports allocated to a VM from this NAT config."
|
||||
type = number
|
||||
default = 64
|
||||
variable "config_port_allocation" {
|
||||
description = "Configuration for how to assign ports to virtual machines. min_ports_per_vm and max_ports_per_vm have no effect unless enable_dynamic_port_allocation is set to 'true'."
|
||||
type = object({
|
||||
enable_endpoint_independent_mapping = optional(bool, true)
|
||||
enable_dynamic_port_allocation = optional(bool, false)
|
||||
min_ports_per_vm = optional(number, 64)
|
||||
max_ports_per_vm = optional(number, 65536)
|
||||
})
|
||||
|
||||
default = {
|
||||
enable_endpoint_independent_mapping = true
|
||||
enable_dynamic_port_allocation = false
|
||||
min_ports_per_vm = 64
|
||||
max_ports_per_vm = 65536
|
||||
}
|
||||
|
||||
validation {
|
||||
condition = var.config_port_allocation.enable_dynamic_port_allocation ? var.config_port_allocation.enable_endpoint_independent_mapping == false : true
|
||||
error_message = "You must set enable_endpoint_independent_mapping to false to set enable_dynamic_port_allocation to true."
|
||||
}
|
||||
}
|
||||
|
||||
variable "config_source_subnets" {
|
||||
|
|
|
|||
Loading…
Reference in New Issue