feat: Added a new property to the subnet input variable map, no_addr_prefix, that if set to "true" will not automatically create a new matching address prefix for the subnet, no matter the condition. (#727)

Author: toddgiguere

README.md

@@ -854,7 +854,7 @@ module "cluster_pattern" {
 | <a name="module_placement_group_map"></a> [placement\_group\_map](#module\_placement\_group\_map) | ./dynamic_values/config_modules/list_to_map | n/a |
 | <a name="module_ssh_keys"></a> [ssh\_keys](#module\_ssh\_keys) | ./ssh_key | n/a |
 | <a name="module_teleport_config"></a> [teleport\_config](#module\_teleport\_config) | ./teleport_config | n/a |
-| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.16.1 |
+| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-ibm-modules/landing-zone-vpc/ibm | 7.17.1 |
 | <a name="module_vsi"></a> [vsi](#module\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 3.2.1 |
 
 ### Resources
@@ -924,7 +924,7 @@ module "cluster_pattern" {
 | <a name="input_transit_gateway_resource_group"></a> [transit\_gateway\_resource\_group](#input\_transit\_gateway\_resource\_group) | Name of resource group to use for transit gateway. Must be included in `var.resource_group` | `string` | n/a | yes |
 | <a name="input_virtual_private_endpoints"></a> [virtual\_private\_endpoints](#input\_virtual\_private\_endpoints) | Object describing VPE to be created | <pre>list(<br>    object({<br>      service_name   = string<br>      service_type   = string<br>      resource_group = optional(string)<br>      access_tags    = optional(list(string), [])<br>      vpcs = list(<br>        object({<br>          name                = string<br>          subnets             = list(string)<br>          security_group_name = optional(string)<br>        })<br>      )<br>    })<br>  )</pre> | n/a | yes |
 | <a name="input_vpc_placement_groups"></a> [vpc\_placement\_groups](#input\_vpc\_placement\_groups) | List of VPC placement groups to create | <pre>list(<br>    object({<br>      access_tags    = optional(list(string), [])<br>      name           = string<br>      resource_group = optional(string)<br>      strategy       = string<br>    })<br>  )</pre> | `[]` | no |
-| <a name="input_vpcs"></a> [vpcs](#input\_vpcs) | A map describing VPCs to be created in this repo. | <pre>list(<br>    object({<br>      prefix          = string # VPC prefix<br>      existing_vpc_id = optional(string)<br>      existing_subnets = optional(<br>        list(<br>          object({<br>            id             = string<br>            public_gateway = optional(bool, false)<br>          })<br>        )<br>      )<br>      resource_group              = optional(string) # Name of the group where VPC will be created<br>      access_tags                 = optional(list(string), [])<br>      classic_access              = optional(bool)<br>      default_network_acl_name    = optional(string)<br>      default_security_group_name = optional(string)<br>      clean_default_sg_acl        = optional(bool, false)<br>      default_security_group_rules = optional(<br>        list(<br>          object({<br>            name      = string<br>            direction = string<br>            remote    = string<br>            tcp = optional(<br>              object({<br>                port_max = optional(number)<br>                port_min = optional(number)<br>              })<br>            )<br>            udp = optional(<br>              object({<br>                port_max = optional(number)<br>                port_min = optional(number)<br>              })<br>            )<br>            icmp = optional(<br>              object({<br>                type = optional(number)<br>                code = optional(number)<br>              })<br>            )<br>          })<br>        )<br>      )<br>      default_routing_table_name = optional(string)<br>      flow_logs_bucket_name      = optional(string)<br>      address_prefixes = optional(<br>        object({<br>          zone-1 = optional(list(string))<br>          zone-2 = optional(list(string))<br>          zone-3 = optional(list(string))<br>        })<br>      )<br>      network_acls = list(<br>        object({<br>          name                         = string<br>          add_ibm_cloud_internal_rules = optional(bool)<br>          add_vpc_connectivity_rules   = optional(bool)<br>          prepend_ibm_rules            = optional(bool)<br>          rules = list(<br>            object({<br>              name        = string<br>              action      = string<br>              destination = string<br>              direction   = string<br>              source      = string<br>              tcp = optional(<br>                object({<br>                  port_max        = optional(number)<br>                  port_min        = optional(number)<br>                  source_port_max = optional(number)<br>                  source_port_min = optional(number)<br>                })<br>              )<br>              udp = optional(<br>                object({<br>                  port_max        = optional(number)<br>                  port_min        = optional(number)<br>                  source_port_max = optional(number)<br>                  source_port_min = optional(number)<br>                })<br>              )<br>              icmp = optional(<br>                object({<br>                  type = optional(number)<br>                  code = optional(number)<br>                })<br>              )<br>            })<br>          )<br>        })<br>      )<br>      use_public_gateways = object({<br>        zone-1 = optional(bool)<br>        zone-2 = optional(bool)<br>        zone-3 = optional(bool)<br>      })<br>      subnets = optional(object({<br>        zone-1 = list(object({<br>          name           = string<br>          cidr           = string<br>          public_gateway = optional(bool)<br>          acl_name       = string<br>        }))<br>        zone-2 = list(object({<br>          name           = string<br>          cidr           = string<br>          public_gateway = optional(bool)<br>          acl_name       = string<br>        }))<br>        zone-3 = list(object({<br>          name           = string<br>          cidr           = string<br>          public_gateway = optional(bool)<br>          acl_name       = string<br>        }))<br>      }))<br>    })<br>  )</pre> | n/a | yes |
+| <a name="input_vpcs"></a> [vpcs](#input\_vpcs) | A map describing VPCs to be created in this repo. | <pre>list(<br>    object({<br>      prefix          = string # VPC prefix<br>      existing_vpc_id = optional(string)<br>      existing_subnets = optional(<br>        list(<br>          object({<br>            id             = string<br>            public_gateway = optional(bool, false)<br>          })<br>        )<br>      )<br>      resource_group              = optional(string) # Name of the group where VPC will be created<br>      access_tags                 = optional(list(string), [])<br>      classic_access              = optional(bool)<br>      default_network_acl_name    = optional(string)<br>      default_security_group_name = optional(string)<br>      clean_default_sg_acl        = optional(bool, false)<br>      default_security_group_rules = optional(<br>        list(<br>          object({<br>            name      = string<br>            direction = string<br>            remote    = string<br>            tcp = optional(<br>              object({<br>                port_max = optional(number)<br>                port_min = optional(number)<br>              })<br>            )<br>            udp = optional(<br>              object({<br>                port_max = optional(number)<br>                port_min = optional(number)<br>              })<br>            )<br>            icmp = optional(<br>              object({<br>                type = optional(number)<br>                code = optional(number)<br>              })<br>            )<br>          })<br>        )<br>      )<br>      default_routing_table_name = optional(string)<br>      flow_logs_bucket_name      = optional(string)<br>      address_prefixes = optional(<br>        object({<br>          zone-1 = optional(list(string))<br>          zone-2 = optional(list(string))<br>          zone-3 = optional(list(string))<br>        })<br>      )<br>      network_acls = list(<br>        object({<br>          name                         = string<br>          add_ibm_cloud_internal_rules = optional(bool)<br>          add_vpc_connectivity_rules   = optional(bool)<br>          prepend_ibm_rules            = optional(bool)<br>          rules = list(<br>            object({<br>              name        = string<br>              action      = string<br>              destination = string<br>              direction   = string<br>              source      = string<br>              tcp = optional(<br>                object({<br>                  port_max        = optional(number)<br>                  port_min        = optional(number)<br>                  source_port_max = optional(number)<br>                  source_port_min = optional(number)<br>                })<br>              )<br>              udp = optional(<br>                object({<br>                  port_max        = optional(number)<br>                  port_min        = optional(number)<br>                  source_port_max = optional(number)<br>                  source_port_min = optional(number)<br>                })<br>              )<br>              icmp = optional(<br>                object({<br>                  type = optional(number)<br>                  code = optional(number)<br>                })<br>              )<br>            })<br>          )<br>        })<br>      )<br>      use_public_gateways = object({<br>        zone-1 = optional(bool)<br>        zone-2 = optional(bool)<br>        zone-3 = optional(bool)<br>      })<br>      subnets = optional(object({<br>        zone-1 = list(object({<br>          name           = string<br>          cidr           = string<br>          public_gateway = optional(bool)<br>          acl_name       = string<br>          no_addr_prefix = optional(bool, false)<br>        }))<br>        zone-2 = list(object({<br>          name           = string<br>          cidr           = string<br>          public_gateway = optional(bool)<br>          acl_name       = string<br>          no_addr_prefix = optional(bool, false)<br>        }))<br>        zone-3 = list(object({<br>          name           = string<br>          cidr           = string<br>          public_gateway = optional(bool)<br>          acl_name       = string<br>          no_addr_prefix = optional(bool, false)<br>        }))<br>      }))<br>    })<br>  )</pre> | n/a | yes |
 | <a name="input_vpn_gateways"></a> [vpn\_gateways](#input\_vpn\_gateways) | List of VPN Gateways to create. | <pre>list(<br>    object({<br>      name           = string<br>      vpc_name       = string<br>      subnet_name    = string # Do not include prefix, use same name as in `var.subnets`<br>      mode           = optional(string)<br>      resource_group = optional(string)<br>      access_tags    = optional(list(string), [])<br>    })<br>  )</pre> | n/a | yes |
 | <a name="input_vsi"></a> [vsi](#input\_vsi) | A list describing VSI workloads to create | <pre>list(<br>    object({<br>      name                            = string<br>      vpc_name                        = string<br>      subnet_names                    = list(string)<br>      ssh_keys                        = list(string)<br>      image_name                      = string<br>      machine_type                    = string<br>      vsi_per_subnet                  = number<br>      user_data                       = optional(string)<br>      resource_group                  = optional(string)<br>      enable_floating_ip              = optional(bool)<br>      security_groups                 = optional(list(string))<br>      boot_volume_encryption_key_name = optional(string)<br>      access_tags                     = optional(list(string), [])<br>      security_group = optional(<br>        object({<br>          name = string<br>          rules = list(<br>            object({<br>              name      = string<br>              direction = string<br>              source    = string<br>              tcp = optional(<br>                object({<br>                  port_max = number<br>                  port_min = number<br>                })<br>              )<br>              udp = optional(<br>                object({<br>                  port_max = number<br>                  port_min = number<br>                })<br>              )<br>              icmp = optional(<br>                object({<br>                  type = number<br>                  code = number<br>                })<br>              )<br>            })<br>          )<br>        })<br>      )<br>      block_storage_volumes = optional(list(<br>        object({<br>          name           = string<br>          profile        = string<br>          capacity       = optional(number)<br>          iops           = optional(number)<br>          encryption_key = optional(string)<br>        })<br>      ))<br>      load_balancers = optional(list(<br>        object({<br>          name                    = string<br>          type                    = string<br>          listener_port           = number<br>          listener_protocol       = string<br>          connection_limit        = number<br>          algorithm               = string<br>          protocol                = string<br>          health_delay            = number<br>          health_retries          = number<br>          health_timeout          = number<br>          health_type             = string<br>          pool_member_port        = string<br>          idle_connection_timeout = optional(number)<br>          security_group = optional(<br>            object({<br>              name = string<br>              rules = list(<br>                object({<br>                  name      = string<br>                  direction = string<br>                  source    = string<br>                  tcp = optional(<br>                    object({<br>                      port_max = number<br>                      port_min = number<br>                    })<br>                  )<br>                  udp = optional(<br>                    object({<br>                      port_max = number<br>                      port_min = number<br>                    })<br>                  )<br>                  icmp = optional(<br>                    object({<br>                      type = number<br>                      code = number<br>                    })<br>                  )<br>                })<br>              )<br>            })<br>          )<br>        })<br>      ))<br>    })<br>  )</pre> | n/a | yes |
 | <a name="input_wait_till"></a> [wait\_till](#input\_wait\_till) | To avoid long wait times when you run your Terraform code, you can specify the stage when you want Terraform to mark the cluster resource creation as completed. Depending on what stage you choose, the cluster creation might not be fully completed and continues to run in the background. However, your Terraform code can continue to run without waiting for the cluster to be fully created. Supported args are `MasterNodeReady`, `OneWorkerNodeReady`, and `IngressReady` | `string` | `"IngressReady"` | no |

main.tf

@@ -12,7 +12,7 @@ locals {
 # Due to existing implicit dependencies we do not think this will be an issue, including auth policies for activity tracker.
 module "vpc" {
   source                      = "terraform-ibm-modules/landing-zone-vpc/ibm"
-  version                     = "7.16.1"
+  version                     = "7.17.1"
   for_each                    = local.vpc_map
   name                        = each.value.prefix
   existing_vpc_id             = each.value.existing_vpc_id

variables.tf

@@ -165,18 +165,21 @@ variable "vpcs" {
           cidr           = string
           public_gateway = optional(bool)
           acl_name       = string
+          no_addr_prefix = optional(bool, false)
         }))
         zone-2 = list(object({
           name           = string
           cidr           = string
           public_gateway = optional(bool)
           acl_name       = string
+          no_addr_prefix = optional(bool, false)
         }))
         zone-3 = list(object({
           name           = string
           cidr           = string
           public_gateway = optional(bool)
           acl_name       = string
+          no_addr_prefix = optional(bool, false)
         }))
       }))
     })