Skip to content

Commit 4ee4d8f

Browse files
committed
Fix Precommit
1 parent 80323d2 commit 4ee4d8f

4 files changed

Lines changed: 9 additions & 6 deletions

File tree

modules/compute/vm-instance/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ limitations under the License.
226226
| <a name="input_metadata"></a> [metadata](#input\_metadata) | Metadata, provided as a map | `map(string)` | `{}` | no |
227227
| <a name="input_min_cpu_platform"></a> [min\_cpu\_platform](#input\_min\_cpu\_platform) | The name of the minimum CPU platform that you want the instance to use. | `string` | `null` | no |
228228
| <a name="input_name_prefix"></a> [name\_prefix](#input\_name\_prefix) | An optional name for all VM and disk resources.<br/>If not supplied, `deployment_name` will be used.<br/>When `name_prefix` is supplied, and `add_deployment_name_before_prefix` is set,<br/>then resources are named by "<`deployment_name`>-<`name_prefix`>-<#>". | `string` | `null` | no |
229-
| <a name="input_network_interfaces"></a> [network\_interfaces](#input\_network\_interfaces) | A list of network interfaces. The options match that of the terraform<br/>network\_interface block of google\_compute\_instance. For descriptions of the<br/>subfields or more information see the documentation:<br/>https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance#nested_network_interface<br/><br/>**\_NOTE:\_** If `network_interfaces` are set, `network_self_link` and<br/>`subnetwork_self_link` will be ignored, even if they are provided through<br/>the `use` field. `bandwidth_tier` and `disable_public_ips` also do not apply<br/>to network interfaces defined in this variable.<br/><br/>Subfields:<br/>network (string, required if subnetwork is not supplied)<br/>subnetwork (string, required if network is not supplied)<br/>subnetwork\_project (string, optional)<br/>network\_ip (string, optional)<br/>nic\_type (string, optional, choose from ["GVNIC", "VIRTIO\_NET", "MRDMA", "IRDMA"])<br/>stack\_type (string, optional, choose from ["IPV4\_ONLY", "IPV4\_IPV6"])<br/>queue\_count (number, optional)<br/>access\_config (object, optional)<br/>ipv6\_access\_config (object, optional)<br/>alias\_ip\_range (list(object), optional) | <pre>list(object({<br/> network = string,<br/> subnetwork = string,<br/> subnetwork_project = string,<br/> network_ip = string,<br/> nic_type = string,<br/> stack_type = string,<br/> queue_count = number,<br/> access_config = list(object({<br/> nat_ip = string,<br/> public_ptr_domain_name = string,<br/> network_tier = string<br/> })),<br/> ipv6_access_config = list(object({<br/> public_ptr_domain_name = string,<br/> network_tier = string<br/> })),<br/> alias_ip_range = list(object({<br/> ip_cidr_range = string,<br/> subnetwork_range_name = string<br/> }))<br/> }))</pre> | `[]` | no |
229+
| <a name="input_network_interfaces"></a> [network\_interfaces](#input\_network\_interfaces) | A list of network interfaces. The options match that of the terraform<br/>network\_interface block of google\_compute\_instance. For descriptions of the<br/>subfields or more information see the documentation:<br/>https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_instance#nested_network_interface<br/><br/>**\_NOTE:\_** If `network_interfaces` are set, `network_self_link` and<br/>`subnetwork_self_link` will be ignored, even if they are provided through<br/>the `use` field. `bandwidth_tier` and `disable_public_ips` also do not apply<br/>to network interfaces defined in this variable.<br/><br/>Subfields:<br/>network (string, required if subnetwork is not supplied)<br/>subnetwork (string, required if network is not supplied)<br/>subnetwork\_project (string, optional)<br/>network\_ip (string, optional)<br/>nic\_type (string, optional, choose from ["GVNIC", "VIRTIO\_NET", "MRDMA", "IRDMA", "IDPF"])<br/>stack\_type (string, optional, choose from ["IPV4\_ONLY", "IPV4\_IPV6", "IPV6\_ONLY"])<br/>queue\_count (number, optional)<br/>access\_config (object, optional)<br/>ipv6\_access\_config (object, optional)<br/>alias\_ip\_range (list(object), optional) | <pre>list(object({<br/> network = string,<br/> subnetwork = string,<br/> subnetwork_project = string,<br/> network_ip = string,<br/> nic_type = string,<br/> stack_type = string,<br/> queue_count = number,<br/> access_config = list(object({<br/> nat_ip = string,<br/> public_ptr_domain_name = string,<br/> network_tier = string<br/> })),<br/> ipv6_access_config = list(object({<br/> public_ptr_domain_name = string,<br/> network_tier = string<br/> })),<br/> alias_ip_range = list(object({<br/> ip_cidr_range = string,<br/> subnetwork_range_name = string<br/> }))<br/> }))</pre> | `[]` | no |
230230
| <a name="input_network_self_link"></a> [network\_self\_link](#input\_network\_self\_link) | The self link of the network to attach the VM. Can use "default" for the default network. | `string` | `null` | no |
231231
| <a name="input_network_storage"></a> [network\_storage](#input\_network\_storage) | An array of network attached storage mounts to be configured. | <pre>list(object({<br/> server_ip = string,<br/> remote_mount = string,<br/> local_mount = string,<br/> fs_type = string,<br/> mount_options = string,<br/> client_install_runner = map(string)<br/> mount_runner = map(string)<br/> }))</pre> | `[]` | no |
232232
| <a name="input_on_host_maintenance"></a> [on\_host\_maintenance](#input\_on\_host\_maintenance) | Describes maintenance behavior for the instance. If left blank this will default to `MIGRATE` except for when `placement_policy`, spot provisioning, or GPUs require it to be `TERMINATE` | `string` | `null` | no |

modules/network/gpu-rdma-vpc/main.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
locals {
1818
autoname = replace(var.deployment_name, "_", "-")
1919
network_name = var.network_name == null ? "${local.autoname}-net" : var.network_name
20-
subnet_prefix = var.subnetworks_template==null || var.subnetworks_template.name_prefix == null ? "${local.autoname}-subnet" : var.subnetworks_template.name_prefix
20+
subnet_prefix = var.subnetworks_template == null || var.subnetworks_template.name_prefix == null ? "${local.autoname}-subnet" : var.subnetworks_template.name_prefix
2121
is_roce_metal = var.network_profile != null ? can(regex("vpc-roce-metal", var.network_profile)) : false
2222

2323
new_bits = local.is_roce_metal ? 0 : ceil(log(var.subnetworks_template.count, 2))
24-
// RoCE metal profile doesn't allow creating a subnetwork, as the profile
25-
// automatically creates a predefined subnetwork for the MRDMA interfaces.
26-
// See: https://cloud.google.com/vpc/docs/network-profiles
24+
/** RoCE metal profile doesn't allow creating a subnetwork, as the profile
25+
* automatically creates a predefined subnetwork for the MRDMA interfaces.
26+
* See: https://cloud.google.com/vpc/docs/network-profiles
27+
**/
2728
template_subnetworks = local.is_roce_metal ? [] : [for i in range(var.subnetworks_template.count) :
2829
{
2930
subnet_name = "${local.subnet_prefix}-${i}"

modules/network/gpu-rdma-vpc/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ output "subnetwork_interfaces_gke" {
5656
output "subnetwork_name_prefix" {
5757
description = "Prefix of the RDMA subnetwork names"
5858
# This uses a conditional: if the variable is null, return null; otherwise, return the prefix.
59-
value = var.subnetworks_template != null ? var.subnetworks_template.name_prefix : null
59+
value = var.subnetworks_template != null ? var.subnetworks_template.name_prefix : null
6060
}

modules/network/vpc/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,11 @@ limitations under the License.
200200
| <a name="input_enable_iap_ssh_ingress"></a> [enable\_iap\_ssh\_ingress](#input\_enable\_iap\_ssh\_ingress) | Enable a firewall rule to allow SSH access using IAP tunnels | `bool` | `true` | no |
201201
| <a name="input_enable_iap_winrm_ingress"></a> [enable\_iap\_winrm\_ingress](#input\_enable\_iap\_winrm\_ingress) | Enable a firewall rule to allow Windows Remote Management (WinRM) access using IAP tunnels | `bool` | `false` | no |
202202
| <a name="input_enable_internal_traffic"></a> [enable\_internal\_traffic](#input\_enable\_internal\_traffic) | Enable a firewall rule to allow all internal TCP, UDP, and ICMP traffic within the network | `bool` | `true` | no |
203+
| <a name="input_enable_ipv6_ula"></a> [enable\_ipv6\_ula](#input\_enable\_ipv6\_ula) | Enable IPv6 ULA, this is a permanent change and cannot be undone! | `bool` | `false` | no |
203204
| <a name="input_extra_iap_ports"></a> [extra\_iap\_ports](#input\_extra\_iap\_ports) | A list of TCP ports for which to create firewall rules that enable IAP for TCP forwarding (use dedicated enable\_iap variables for standard ports) | `list(string)` | `[]` | no |
204205
| <a name="input_firewall_log_config"></a> [firewall\_log\_config](#input\_firewall\_log\_config) | Firewall log configuration for Toolkit firewall rules (var.enable\_iap\_ssh\_ingress and others) | `string` | `"DISABLE_LOGGING"` | no |
205206
| <a name="input_firewall_rules"></a> [firewall\_rules](#input\_firewall\_rules) | List of firewall rules | `any` | `[]` | no |
207+
| <a name="input_internal_ipv6_range"></a> [internal\_ipv6\_range](#input\_internal\_ipv6\_range) | When enabling IPv6 ULA, optionally specify a /48 from fd20::/20 (default null) | `string` | `null` | no |
206208
| <a name="input_ips_per_nat"></a> [ips\_per\_nat](#input\_ips\_per\_nat) | The number of IP addresses to allocate for each regional Cloud NAT (set to 0 to disable NAT). The number of NAT IPs depend on the port reservation allocated for each node and the number of ports that a single NAT IP can serve. Refer this documentation for more details: https://cloud.google.com/nat/docs/ports-and-addresses#port-reservation-examples | `number` | `2` | no |
207209
| <a name="input_labels"></a> [labels](#input\_labels) | Labels to add to network resources that support labels. Key-value pairs of strings. | `map(string)` | `{}` | no |
208210
| <a name="input_mtu"></a> [mtu](#input\_mtu) | The network MTU (default: 8896). Recommended values: 0 (use Compute Engine default), 1460 (default outside HPC environments), 1500 (Internet default), or 8896 (for Jumbo packets). Allowed are all values in the range 1300 to 8896, inclusively. | `number` | `8896` | no |

0 commit comments

Comments
 (0)