Fix(subnetwork_project): subnetwork_project was missing from local block in htcondor-execute-point module (#5839)

Author: kadupoornima

community/modules/compute/htcondor-execute-point/README.md

@@ -249,7 +249,7 @@ limitations under the License.
 | <a name="input_metadata"></a> [metadata](#input\_metadata) | Metadata to add to HTCondor execute points | `map(string)` | `{}` | no |
 | <a name="input_min_idle"></a> [min\_idle](#input\_min\_idle) | Minimum number of idle VMs in the HTCondor pool (if pool reaches var.max\_size, this minimum is not guaranteed); set to ensure jobs beginning run more quickly. | `number` | `0` | no |
 | <a name="input_name_prefix"></a> [name\_prefix](#input\_name\_prefix) | Name prefix given to hostnames in this group of execute points; must be unique across all instances of this module | `string` | n/a | yes |
-| <a name="input_network_interfaces"></a> [network\_interfaces](#input\_network\_interfaces) | A list of network interfaces to attach to HTCondor execute point instances.<br/>Each network interface should have the following fields:<br/>- network (required): The self link of the network<br/>- subnetwork (optional): The self link of the subnetwork<br/>- nic\_type (optional): "GVNIC" or "VIRTIO\_NET"<br/>- stack\_type (optional): "IPV4\_ONLY" or "IPV4\_IPV6"<br/>- network\_ip (optional): Specific IP address to assign<br/>- queue\_count (optional): Queue count for multiqueue NIC<br/>- access\_config (optional): List of NAT config objects<br/>- ipv6\_access\_config (optional): List of IPv6 access config objects<br/>- alias\_ip\_range (optional): List of alias IP ranges<br/><br/>If the list is empty, the module will fall back to using var.network\_self\_link<br/>and var.subnetwork\_self\_link for backward compatibility.<br/><br/>NB: If you update the current setup with network interfaces, you may need to delete the current mig to apply the new network interface configuration | <pre>list(object({<br/>    network            = string<br/>    subnetwork         = optional(string)<br/>    subnetwork_project = optional(string)<br/>    nic_type           = optional(string)<br/>    stack_type         = optional(string)<br/>    network_ip         = optional(string, "")<br/>    queue_count        = optional(number)<br/>    access_config = optional(list(object({<br/>      nat_ip       = optional(string)<br/>      network_tier = optional(string)<br/>    })), [])<br/>    ipv6_access_config = optional(list(object({<br/>      network_tier = optional(string)<br/>    })), [])<br/>    alias_ip_range = optional(list(object({<br/>      ip_cidr_range         = string<br/>      subnetwork_range_name = string<br/>    })), [])<br/>  }))</pre> | `[]` | no |
+| <a name="input_network_interfaces"></a> [network\_interfaces](#input\_network\_interfaces) | A list of network interfaces to attach to HTCondor execute point instances.<br/>Each network interface should have the following fields:<br/>- network (required): The self link of the network<br/>- subnetwork (optional): The self link of the subnetwork<br/>- subnetwork\_project (optional): The self link of the subnetwork project<br/>- nic\_type (optional): "GVNIC" or "VIRTIO\_NET"<br/>- stack\_type (optional): "IPV4\_ONLY" or "IPV4\_IPV6"<br/>- network\_ip (optional): Specific IP address to assign<br/>- queue\_count (optional): Queue count for multiqueue NIC<br/>- access\_config (optional): List of NAT config objects<br/>- ipv6\_access\_config (optional): List of IPv6 access config objects<br/>- alias\_ip\_range (optional): List of alias IP ranges<br/><br/>If the list is empty, the module will fall back to using var.network\_self\_link<br/>and var.subnetwork\_self\_link for backward compatibility.<br/><br/>NB: If you update the current setup with network interfaces, you may need to delete the current mig to apply the new network interface configuration | <pre>list(object({<br/>    network            = string<br/>    subnetwork         = optional(string)<br/>    subnetwork_project = optional(string)<br/>    nic_type           = optional(string)<br/>    stack_type         = optional(string)<br/>    network_ip         = optional(string, "")<br/>    queue_count        = optional(number)<br/>    access_config = optional(list(object({<br/>      nat_ip       = optional(string)<br/>      network_tier = optional(string)<br/>    })), [])<br/>    ipv6_access_config = optional(list(object({<br/>      network_tier = optional(string)<br/>    })), [])<br/>    alias_ip_range = optional(list(object({<br/>      ip_cidr_range         = string<br/>      subnetwork_range_name = string<br/>    })), [])<br/>  }))</pre> | `[]` | no |
 | <a name="input_network_self_link"></a> [network\_self\_link](#input\_network\_self\_link) | The self link of the network HTCondor execute points will join | `string` | `"default"` | no |
 | <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 |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | Project in which the HTCondor execute points will be created | `string` | n/a | yes |

community/modules/compute/htcondor-execute-point/main.tf

@@ -125,6 +125,7 @@ locals {
       for ni in var.network_interfaces : {
         network            = ni.network
         subnetwork         = ni.subnetwork
+        subnetwork_project = ni.subnetwork_project
         nic_type           = ni.nic_type
         stack_type         = ni.stack_type
         network_ip         = ni.network_ip
@@ -138,6 +139,7 @@ locals {
       {
         network            = var.network_self_link
         subnetwork         = var.subnetwork_self_link
+        subnetwork_project = null
         nic_type           = null
         stack_type         = null
         network_ip         = ""
@@ -182,11 +184,12 @@ module "execute_point_instance_template" {
   source  = "terraform-google-modules/vm/google//modules/instance_template"
   version = "~> 14.0"
 
-  name_prefix = local.name_prefix
-  project_id  = var.project_id
-  region      = var.region
-  network     = local.network_interfaces[0].network
-  subnetwork  = local.network_interfaces[0].subnetwork
+  name_prefix        = local.name_prefix
+  project_id         = var.project_id
+  region             = var.region
+  network            = local.network_interfaces[0].network
+  subnetwork         = local.network_interfaces[0].subnetwork
+  subnetwork_project = local.network_interfaces[0].subnetwork_project
 
   additional_networks = [
     for network_interface in slice(local.network_interfaces, 1, length(local.network_interfaces)) : {

community/modules/compute/htcondor-execute-point/variables.tf

@@ -141,6 +141,7 @@ variable "network_interfaces" {
     Each network interface should have the following fields:
     - network (required): The self link of the network
     - subnetwork (optional): The self link of the subnetwork
+    - subnetwork_project (optional): The self link of the subnetwork project
     - nic_type (optional): "GVNIC" or "VIRTIO_NET"
     - stack_type (optional): "IPV4_ONLY" or "IPV4_IPV6"
     - network_ip (optional): Specific IP address to assign